chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

api: Normalize std::fmt import

Browse Source
This commit is contained in:
Jonas Platte 2021-04-09 12:51:50 +02:00
parent 7acd73ec9a
commit 85f152fccc
No known key found for this signature in database
GPG Key ID: CC154DE0E30B7C67
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ruma-api/src/error.rs
View File

@ -2,10 +2,7 @@
//! converting between http requests / responses and ruma's representation of //! converting between http requests / responses and ruma's representation of
//! matrix API requests / responses. //! matrix API requests / responses.
use std::{ use std::{error::Error as StdError, fmt};
error::Error as StdError,
fmt::{self, Debug, Display, Formatter},
};
use thiserror::Error; use thiserror::Error;
@ -24,7 +21,7 @@ impl EndpointError for Void {
} }
} }
impl Display for Void { impl fmt::Display for Void {
fn fmt(&self, _: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, _: &mut fmt::Formatter<'_>) -> fmt::Result {
match *self {} match *self {}
} }
@ -100,8 +97,8 @@ pub enum FromHttpResponseError<E> {
Http(ServerError<E>), Http(ServerError<E>),
} }
impl<E: Display> Display for FromHttpResponseError<E> { impl<E: fmt::Display> fmt::Display for FromHttpResponseError<E> {
fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self { match self {
Self::Deserialization(err) => write!(f, "deserialization failed: {}", err), Self::Deserialization(err) => write!(f, "deserialization failed: {}", err),
Self::Http(err) => write!(f, "the server returned an error: {}", err), Self::Http(err) => write!(f, "the server returned an error: {}", err),
@ -146,12 +143,12 @@ impl ResponseDeserializationError {
} }
} }
impl Display for ResponseDeserializationError { impl fmt::Display for ResponseDeserializationError {
fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
if let Some(ref inner) = self.inner { if let Some(ref inner) = self.inner {
Display::fmt(inner, f) fmt::Display::fmt(inner, f)
} else { } else {
Display::fmt("deserialization error, no error specified", f) fmt::Display::fmt("deserialization error, no error specified", f)
} }
} }
} }
@ -169,11 +166,11 @@ pub enum ServerError<E> {
Unknown(ResponseDeserializationError), Unknown(ResponseDeserializationError),
} }
impl<E: Display> Display for ServerError<E> { impl<E: fmt::Display> fmt::Display for ServerError<E> {
fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self { match self {
ServerError::Known(e) => Display::fmt(e, f), ServerError::Known(e) => fmt::Display::fmt(e, f),
ServerError::Unknown(res_err) => Display::fmt(res_err, f), ServerError::Unknown(res_err) => fmt::Display::fmt(res_err, f),
} }
} }
} }