diff options
| author | Alex Auvolat <alex@adnab.me> | 2021-03-18 19:27:02 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2021-03-18 19:27:02 +0100 |
| commit | 4348bde180887f5185ca6da6024476e8e8fb2fe6 (patch) | |
| tree | 8a35f0e4229d15665af7673eebcaa1b3d75a73cb /src/api/error.rs | |
| parent | 5b659b28ce6bef15072d2fc93f777aa8ff73b2d8 (diff) | |
| parent | 4eb16e886388f35d2bdee52b16922421004cf132 (diff) | |
| download | garage-4348bde180887f5185ca6da6024476e8e8fb2fe6.tar.gz garage-4348bde180887f5185ca6da6024476e8e8fb2fe6.zip | |
Merge branch 'dev-0.2'
Diffstat (limited to 'src/api/error.rs')
| -rw-r--r-- | src/api/error.rs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/api/error.rs b/src/api/error.rs index a1681fc3..42a7ab10 100644 --- a/src/api/error.rs +++ b/src/api/error.rs @@ -33,7 +33,7 @@ pub enum Error { InvalidBase64(#[error(source)] base64::DecodeError), #[error(display = "Invalid XML: {}", _0)] - InvalidXML(#[error(source)] roxmltree::Error), + InvalidXML(String), #[error(display = "Invalid header value: {}", _0)] InvalidHeader(#[error(source)] hyper::header::ToStrError), @@ -45,6 +45,12 @@ pub enum Error { BadRequest(String), } +impl From<roxmltree::Error> for Error { + fn from(err: roxmltree::Error) -> Self { + Self::InvalidXML(format!("{}", err)) + } +} + impl Error { pub fn http_status_code(&self) -> StatusCode { match self { |