Skip to content

fix an Error/Display impl #1262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix an Error/Display impl #1262

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 17 additions & 21 deletions tokio-postgres/src/error/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,31 +379,27 @@ impl fmt::Debug for Error {
impl fmt::Display for Error {
fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
match &self.0.kind {
Kind::Io => fmt.write_str("error communicating with the server")?,
Kind::UnexpectedMessage => fmt.write_str("unexpected message from server")?,
Kind::Tls => fmt.write_str("error performing TLS handshake")?,
Kind::ToSql(idx) => write!(fmt, "error serializing parameter {}", idx)?,
Kind::FromSql(idx) => write!(fmt, "error deserializing column {}", idx)?,
Kind::Column(column) => write!(fmt, "invalid column `{}`", column)?,
Kind::Io => fmt.write_str("error communicating with the server"),
Kind::UnexpectedMessage => fmt.write_str("unexpected message from server"),
Kind::Tls => fmt.write_str("error performing TLS handshake"),
Kind::ToSql(idx) => write!(fmt, "error serializing parameter {}", idx),
Kind::FromSql(idx) => write!(fmt, "error deserializing column {}", idx),
Kind::Column(column) => write!(fmt, "invalid column `{}`", column),
Kind::Parameters(real, expected) => {
write!(fmt, "expected {expected} parameters but got {real}")?
write!(fmt, "expected {expected} parameters but got {real}")
}
Kind::Closed => fmt.write_str("connection closed")?,
Kind::Db => fmt.write_str("db error")?,
Kind::Parse => fmt.write_str("error parsing response from server")?,
Kind::Encode => fmt.write_str("error encoding message to server")?,
Kind::Authentication => fmt.write_str("authentication error")?,
Kind::ConfigParse => fmt.write_str("invalid connection string")?,
Kind::Config => fmt.write_str("invalid configuration")?,
Kind::RowCount => fmt.write_str("query returned an unexpected number of rows")?,
Kind::Closed => fmt.write_str("connection closed"),
Kind::Db => fmt.write_str("db error"),
Kind::Parse => fmt.write_str("error parsing response from server"),
Kind::Encode => fmt.write_str("error encoding message to server"),
Kind::Authentication => fmt.write_str("authentication error"),
Kind::ConfigParse => fmt.write_str("invalid connection string"),
Kind::Config => fmt.write_str("invalid configuration"),
Kind::RowCount => fmt.write_str("query returned an unexpected number of rows"),
#[cfg(feature = "runtime")]
Kind::Connect => fmt.write_str("error connecting to server")?,
Kind::Timeout => fmt.write_str("timeout waiting for server")?,
};
if let Some(ref cause) = self.0.cause {
write!(fmt, ": {}", cause)?;
Kind::Connect => fmt.write_str("error connecting to server"),
Kind::Timeout => fmt.write_str("timeout waiting for server"),
}
Ok(())
}
}

Expand Down