From 7f0de7969aa7d5bf2cdfaa579b738b6618c5a90d Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Tue, 11 Dec 2018 20:28:43 +0100 Subject: [PATCH 1/2] fix for backtrace 0.3.10 --- Cargo.toml | 2 +- src/backtrace/mod.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 6eb0a77..9ddff15 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ path = "./failure_derive" [dependencies.backtrace] optional = true -version = "0.3.3" +version = "0.3.10" [workspace] members = [".", "failure_derive"] diff --git a/src/backtrace/mod.rs b/src/backtrace/mod.rs index 58f0477..fd3ebc2 100644 --- a/src/backtrace/mod.rs +++ b/src/backtrace/mod.rs @@ -129,7 +129,7 @@ with_backtrace! { impl Debug for Backtrace { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { if let Some(bt) = self.internal.as_backtrace() { - bt.fmt(f) + Debug::fmt(bt, f) } else { Ok(()) } } } @@ -137,7 +137,7 @@ with_backtrace! { impl Display for Backtrace { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { if let Some(bt) = self.internal.as_backtrace() { - bt.fmt(f) + Display::fmt(bt, f) } else { Ok(()) } } } From 58e87b3843ec8023e2ce5e5b00cd2b68699ed1ee Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Tue, 11 Dec 2018 20:41:06 +0100 Subject: [PATCH 2/2] work woth old backtrace, to support Rust 1.18 --- Cargo.toml | 2 +- src/backtrace/mod.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 9ddff15..6eb0a77 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ path = "./failure_derive" [dependencies.backtrace] optional = true -version = "0.3.10" +version = "0.3.3" [workspace] members = [".", "failure_derive"] diff --git a/src/backtrace/mod.rs b/src/backtrace/mod.rs index fd3ebc2..2d3ab8d 100644 --- a/src/backtrace/mod.rs +++ b/src/backtrace/mod.rs @@ -137,7 +137,7 @@ with_backtrace! { impl Display for Backtrace { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { if let Some(bt) = self.internal.as_backtrace() { - Display::fmt(bt, f) + Debug::fmt(bt, f) } else { Ok(()) } } }