aboutsummaryrefslogtreecommitdiff
path: root/ctr-std/src
diff options
context:
space:
mode:
authorFenrir <[email protected]>2018-03-01 22:38:22 -0700
committerFenrir <[email protected]>2018-03-01 22:38:22 -0700
commit2adf73b0c20809c174f7b492ac8a902623c3b555 (patch)
tree640fc4c449074aa99033d4d654ae956dbb05fccb /ctr-std/src
parentMerge pull request #62 from FenrirWolf/update-1.24 (diff)
downloadctru-rs-2adf73b0c20809c174f7b492ac8a902623c3b555.tar.xz
ctru-rs-2adf73b0c20809c174f7b492ac8a902623c3b555.zip
Update to nightly-2018-03-01
Diffstat (limited to 'ctr-std/src')
-rw-r--r--ctr-std/src/panicking.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/ctr-std/src/panicking.rs b/ctr-std/src/panicking.rs
index 5efee33..cbc375f 100644
--- a/ctr-std/src/panicking.rs
+++ b/ctr-std/src/panicking.rs
@@ -56,7 +56,7 @@ extern {
data: *mut u8,
data_ptr: *mut usize,
vtable_ptr: *mut usize) -> u32;
- #[unwind]
+ #[unwind(allowed)]
fn __rust_start_panic(data: usize, vtable: usize) -> u32;
}
@@ -517,7 +517,7 @@ pub fn panicking() -> bool {
/// Entry point of panic from the libcore crate.
#[cfg(not(test))]
#[lang = "panic_fmt"]
-#[unwind]
+#[unwind(allowed)]
pub extern fn rust_begin_panic(msg: fmt::Arguments,
file: &'static str,
line: u32,