Skip to content

Commit 67dd086

Browse files
authored
Don't swallow text from nested errors (#108)
Signed-off-by: John Eckersberg <jeckersb@redhat.com>
1 parent 68673c8 commit 67dd086

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

src/imageproxy.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,33 +30,33 @@ use tracing::instrument;
3030
#[derive(Error, Debug)]
3131
#[non_exhaustive]
3232
pub enum Error {
33-
#[error("i/o error")]
33+
#[error("i/o error: {0}")]
3434
/// An input/output error
3535
Io(#[from] std::io::Error),
36-
#[error("skopeo spawn error: {}", .0)]
36+
#[error("skopeo spawn error: {0}")]
3737
/// An error spawning skopeo
3838
SkopeoSpawnError(#[source] std::io::Error),
39-
#[error("serialization error")]
39+
#[error("serialization error: {0}")]
4040
/// Returned when serialization or deserialization fails
4141
SerDe(#[from] serde_json::Error),
4242
/// The proxy failed to initiate a request
4343
#[error("failed to invoke method {method}: {error}")]
4444
RequestInitiationFailure { method: Box<str>, error: Box<str> },
4545
/// An error returned from the remote proxy
46-
#[error("proxy request returned error")]
46+
#[error("proxy request returned error: {0}")]
4747
RequestReturned(Box<str>),
48-
#[error("semantic version error")]
48+
#[error("semantic version error: {0}")]
4949
SemanticVersion(#[from] semver::Error),
5050
#[error("proxy too old (requested={requested_version} found={found_version}) error")]
5151
/// The proxy doesn't support the requested semantic version
5252
ProxyTooOld {
5353
requested_version: Box<str>,
5454
found_version: Box<str>,
5555
},
56-
#[error("configuration error")]
56+
#[error("configuration error: {0}")]
5757
/// Conflicting or missing configuration
5858
Configuration(Box<str>),
59-
#[error("error")]
59+
#[error("other error: {0}")]
6060
/// An unknown other error
6161
Other(Box<str>),
6262
}
@@ -72,9 +72,9 @@ impl Error {
7272
#[non_exhaustive]
7373
pub enum GetBlobError {
7474
/// A client may reasonably retry on this type of error.
75-
#[error("retryable error")]
75+
#[error("retryable error: {0}")]
7676
Retryable(Box<str>),
77-
#[error("error")]
77+
#[error("other error: {0}")]
7878
/// An unknown other error
7979
Other(Box<str>),
8080
}

0 commit comments

Comments
 (0)