From 2adf73b0c20809c174f7b492ac8a902623c3b555 Mon Sep 17 00:00:00 2001 From: Fenrir Date: Thu, 1 Mar 2018 22:38:22 -0700 Subject: [PATCH] Update to nightly-2018-03-01 --- .travis.yml | 2 +- ctr-std/src/panicking.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 895d736..823997c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: rust rust: - - nightly-2018-02-15 + - nightly-2018-03-01 - nightly matrix: 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,