Skip to content

Commit f16bd75

Browse files
bheylinBrian
andauthored
Add impl Display for error::Kind (#33)
Co-authored-by: Brian <[email protected]>
1 parent 4127308 commit f16bd75

File tree

1 file changed

+28
-22
lines changed
  • tokio-postgres/src/error

1 file changed

+28
-22
lines changed

tokio-postgres/src/error/mod.rs

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,33 @@ pub enum Kind {
376376
Timeout,
377377
}
378378

379+
impl fmt::Display for Kind {
380+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
381+
match self {
382+
Kind::Io(err) => write!(f, "error communicating with the server: {err}"),
383+
Kind::UnexpectedMessage => f.write_str("unexpected message from server"),
384+
Kind::Tls(err) => write!(f, "error performing TLS handshake: {err}"),
385+
Kind::ToSql(idx, err) => write!(f, "error serializing parameter {idx}: {err}"),
386+
Kind::FromSql(idx, err) => write!(f, "error deserializing column {idx}: {err}"),
387+
Kind::Column(column) => write!(f, "invalid column `{column}`"),
388+
Kind::Parameters(real, expected) => {
389+
write!(f, "expected {expected} parameters but got {real}")
390+
}
391+
Kind::Closed => f.write_str("connection closed"),
392+
Kind::Db(err) => write!(f, "db error: {err}"),
393+
Kind::Parse(err) => write!(f, "error parsing response from server: {err}"),
394+
Kind::Encode(err) => write!(f, "error encoding message to server: {err}"),
395+
Kind::Authentication(err) => write!(f, "authentication error: {err}"),
396+
Kind::ConfigParse(err) => write!(f, "invalid connection string: {err}"),
397+
Kind::Config(err) => write!(f, "invalid configuration: {err}"),
398+
#[cfg(feature = "runtime")]
399+
Kind::Connect(err) => write!(f, "error connecting to server: {err}"),
400+
Kind::RowCount => f.write_str("query returned an unexpected number of rows"),
401+
Kind::Timeout => f.write_str("timeout waiting for server"),
402+
}
403+
}
404+
}
405+
379406
struct ErrorInner {
380407
kind: Kind,
381408
#[cfg(feature = "tracing-error")]
@@ -399,28 +426,7 @@ impl fmt::Debug for Error {
399426

400427
impl fmt::Display for Error {
401428
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
402-
match &self.0.kind {
403-
Kind::Io(err) => write!(f, "error communicating with the server: {err}")?,
404-
Kind::UnexpectedMessage => f.write_str("unexpected message from server")?,
405-
Kind::Tls(err) => write!(f, "error performing TLS handshake: {err}")?,
406-
Kind::ToSql(idx, err) => write!(f, "error serializing parameter {idx}: {err}")?,
407-
Kind::FromSql(idx, err) => write!(f, "error deserializing column {idx}: {err}")?,
408-
Kind::Column(column) => write!(f, "invalid column `{column}`")?,
409-
Kind::Parameters(real, expected) => {
410-
write!(f, "expected {expected} parameters but got {real}")?
411-
}
412-
Kind::Closed => f.write_str("connection closed")?,
413-
Kind::Db(err) => write!(f, "db error: {err}")?,
414-
Kind::Parse(err) => write!(f, "error parsing response from server: {err}")?,
415-
Kind::Encode(err) => write!(f, "error encoding message to server: {err}")?,
416-
Kind::Authentication(err) => write!(f, "authentication error: {err}")?,
417-
Kind::ConfigParse(err) => write!(f, "invalid connection string: {err}")?,
418-
Kind::Config(err) => write!(f, "invalid configuration: {err}")?,
419-
#[cfg(feature = "runtime")]
420-
Kind::Connect(err) => write!(f, "error connecting to server: {err}")?,
421-
Kind::RowCount => f.write_str("query returned an unexpected number of rows")?,
422-
Kind::Timeout => f.write_str("timeout waiting for server")?,
423-
};
429+
write!(f, "{}", &self.0.kind)?;
424430

425431
#[cfg(feature = "tracing-error")]
426432
{

0 commit comments

Comments
 (0)