diff options
| author | bors <bors@rust-lang.org> | 2016-01-07 01:26:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-01-07 01:26:45 +0000 |
| commit | 3ed6e9e6f0213bec36b92fd8e8aa71f954fef99e (patch) | |
| tree | 5c71bd2a5d3697048cac6802e82a420a07f4430a /src/libstd/sys | |
| parent | 43403b416907e6b965c37daa53d071e1c054a302 (diff) | |
| parent | 022c9c70c48581b8caa17895b447a941a9750076 (diff) | |
| download | rust-3ed6e9e6f0213bec36b92fd8e8aa71f954fef99e.tar.gz rust-3ed6e9e6f0213bec36b92fd8e8aa71f954fef99e.zip | |
Auto merge of #30557 - sfackler:panic-propagate, r=aturon
See rust-lang/rfcs#1413. r? @alexcrichton
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/common/unwind/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sys/common/unwind/mod.rs b/src/libstd/sys/common/unwind/mod.rs index 0f10e727461..666b2ed72ad 100644 --- a/src/libstd/sys/common/unwind/mod.rs +++ b/src/libstd/sys/common/unwind/mod.rs @@ -172,7 +172,7 @@ pub fn panicking() -> bool { #[inline(never)] #[no_mangle] #[allow(private_no_mangle_fns)] -fn rust_panic(cause: Box<Any + Send + 'static>) -> ! { +pub fn rust_panic(cause: Box<Any + Send + 'static>) -> ! { unsafe { imp::panic(cause) } |