From 8561b67b6f263b6647f02d36e0824b6c54544bf0 Mon Sep 17 00:00:00 2001 From: Jane Lusby Date: Sat, 18 Jul 2020 15:51:44 -0700 Subject: [PATCH 1/3] add a Backtrace::disabled function --- src/libstd/backtrace.rs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/libstd/backtrace.rs b/src/libstd/backtrace.rs index e65775c1ced67..28acec79de084 100644 --- a/src/libstd/backtrace.rs +++ b/src/libstd/backtrace.rs @@ -291,6 +291,12 @@ impl Backtrace { Backtrace::create(Backtrace::force_capture as usize) } + /// Forcibly captures a disabled backtrace, regardless of environment + /// variable configuration. + pub fn disabled() -> Backtrace { + Backtrace { inner: Inner::Disabled }; + } + // Capture a backtrace which start just before the function addressed by // `ip` fn create(ip: usize) -> Backtrace { From 397c82bae15031f97bf12f0114834af1ba844b4f Mon Sep 17 00:00:00 2001 From: Jane Lusby Date: Sat, 18 Jul 2020 15:57:57 -0700 Subject: [PATCH 2/3] remove trailing semi --- src/libstd/backtrace.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libstd/backtrace.rs b/src/libstd/backtrace.rs index 28acec79de084..b22d8164b36ab 100644 --- a/src/libstd/backtrace.rs +++ b/src/libstd/backtrace.rs @@ -294,7 +294,7 @@ impl Backtrace { /// Forcibly captures a disabled backtrace, regardless of environment /// variable configuration. pub fn disabled() -> Backtrace { - Backtrace { inner: Inner::Disabled }; + Backtrace { inner: Inner::Disabled } } // Capture a backtrace which start just before the function addressed by From 50347b84dd0c08ff23bd010dc567a7c27944d029 Mon Sep 17 00:00:00 2001 From: Jane Lusby Date: Wed, 22 Jul 2020 17:19:02 -0700 Subject: [PATCH 3/3] Update src/libstd/backtrace.rs Co-authored-by: David Tolnay --- src/libstd/backtrace.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libstd/backtrace.rs b/src/libstd/backtrace.rs index b22d8164b36ab..09f83ea5fca81 100644 --- a/src/libstd/backtrace.rs +++ b/src/libstd/backtrace.rs @@ -293,7 +293,7 @@ impl Backtrace { /// Forcibly captures a disabled backtrace, regardless of environment /// variable configuration. - pub fn disabled() -> Backtrace { + pub const fn disabled() -> Backtrace { Backtrace { inner: Inner::Disabled } }