about summary refs log tree commit diff
path: root/src/libstd/panic.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-11-29 22:00:28 +0000
committerbors <bors@rust-lang.org>2019-11-29 22:00:28 +0000
commit9081929d45f12d3f56d43b1d6db7519981580fc9 (patch)
tree23864775c3e4cab78e4612aad345352b92a28f55 /src/libstd/panic.rs
parent25d8a9494ca6d77361e47c1505ecf640b168819e (diff)
parent0b1b36ccb6c84a16b097f58bb6aa249f5ce73821 (diff)
downloadrust-9081929d45f12d3f56d43b1d6db7519981580fc9.tar.gz
rust-9081929d45f12d3f56d43b1d6db7519981580fc9.zip
Auto merge of #66879 - RalfJung:rollup-nprxpzi, r=RalfJung
Rollup of 11 pull requests

Successful merges:

 - #66379 (Rephrase docs in for ptr)
 - #66589 (Draw vertical lines correctly in compiler error messages)
 - #66613 (Allow customising ty::TraitRef's printing behavior)
 - #66766 (Panic machinery comments and tweaks)
 - #66791 (Handle GlobalCtxt directly from librustc_interface query system)
 - #66793 (Record temporary static references in generator witnesses)
 - #66808 (Cleanup error code)
 - #66826 (Clarifies how to tag users for assigning PRs)
 - #66837 (Clarify `{f32,f64}::EPSILON` docs)
 - #66844 (Miri: do not consider memory allocated by caller_location leaked)
 - #66872 (Minor documentation fix)

Failed merges:

r? @ghost
Diffstat (limited to 'src/libstd/panic.rs')
-rw-r--r--src/libstd/panic.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/panic.rs b/src/libstd/panic.rs
index e36496d4c1c..cd024068d2d 100644
--- a/src/libstd/panic.rs
+++ b/src/libstd/panic.rs
@@ -425,5 +425,5 @@ pub fn catch_unwind<F: FnOnce() -> R + UnwindSafe, R>(f: F) -> Result<R> {
 /// ```
 #[stable(feature = "resume_unwind", since = "1.9.0")]
 pub fn resume_unwind(payload: Box<dyn Any + Send>) -> ! {
-    panicking::update_count_then_panic(payload)
+    panicking::rust_panic_without_hook(payload)
 }