itsscb/tower
1
0
Fork 0
mirror of https://github.com/tower-rs/tower.git synced 2025-10-02 15:25:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Nested errors no longer print "inner service error:" or similar (#56)

Browse Source
This commit is contained in:
Eliza Weisman 2018-02-27 15:36:44 -08:00 committed by Carl Lerche
parent 1efa622b6e
commit 8acbfa80ee
6 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tower-balance/src/lib.rs
View File

@ -323,8 +323,7 @@ where
{
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match *self {
Error::Inner(ref why) =>
write!(f, "inner service error: {}", why),
Error::Inner(ref why) => fmt::Display::fmt(why, f),
Error::Balance(ref why) =>
write!(f, "load balancing failed: {}", why),
Error::NotReady => f.pad("not ready"),

6
tower-buffer/src/lib.rs
View File

@ -232,10 +232,8 @@ where
{
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match *self {
Error::Inner(ref why) =>
write!(f, "inner service error: {}", why),
Error::Closed =>
write!(f, "buffer closed"),
Error::Inner(ref why) => fmt::Display::fmt(why, f),
Error::Closed => f.pad("buffer closed"),
}
}
}

6
tower-in-flight-limit/src/lib.rs
View File

@ -252,10 +252,8 @@ where
{
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match *self {
Error::Upstream(ref why) =>
write!(f, "upstream service error: {}", why),
Error::NoCapacity =>
write!(f, "in-flight limit exceeded"),
Error::Upstream(ref why) => fmt::Display::fmt(why, f),
Error::NoCapacity => write!(f, "in-flight limit exceeded"),
}
}
}

3
tower-rate-limit/src/lib.rs
View File

@ -183,8 +183,7 @@ where
{
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match *self {
Error::Upstream(ref why) =>
write!(f, "upstream service error: {}", why),
Error::Upstream(ref why) => fmt::Display::fmt(why, f)
Error::NoCapacity =>
write!(f, "rate limit exceeded"),
}

6
tower-reconnect/src/lib.rs
View File

@ -172,10 +172,8 @@ where
{
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match *self {
Error::Inner(ref why) =>
write!(f, "inner service error: {}", why),
Error::Connect(ref why) =>
write!(f, "connection failed: {}", why),
Error::Inner(ref why) => fmt::Display::fmt(why, f),
Error::Connect(ref why) => write!(f, "connection failed: {}", why),
Error::NotReady => f.pad("not ready"),
}
}

8
tower-timeout/src/lib.rs
View File

@ -106,10 +106,8 @@ where
{
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match *self {
Error::Inner(ref why) =>
write!(f, "inner service error: {}", why),
Error::Timeout =>
write!(f, "request timed out"),
Error::Inner(ref why) => fmt::Display::fmt(why, f),
Error::Timeout => f.pad("request timed out"),
}
}
}
@ -129,7 +127,7 @@ where
fn description(&self) -> &str {
match *self {
Error::Inner(_) => "inner service error",
Error::NoCapacity => "request timed out",
Error::Timeout => "request timed out",
}
}