Browse Source

Update to nightly-2018-03-01

pull/10/head
Fenrir 7 years ago
parent
commit
2adf73b0c2
  1. 2
      .travis.yml
  2. 4
      ctr-std/src/panicking.rs

2
.travis.yml

@ -1,7 +1,7 @@
language: rust language: rust
rust: rust:
- nightly-2018-02-15 - nightly-2018-03-01
- nightly - nightly
matrix: matrix:

4
ctr-std/src/panicking.rs

@ -56,7 +56,7 @@ extern {
data: *mut u8, data: *mut u8,
data_ptr: *mut usize, data_ptr: *mut usize,
vtable_ptr: *mut usize) -> u32; vtable_ptr: *mut usize) -> u32;
#[unwind] #[unwind(allowed)]
fn __rust_start_panic(data: usize, vtable: usize) -> u32; 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. /// Entry point of panic from the libcore crate.
#[cfg(not(test))] #[cfg(not(test))]
#[lang = "panic_fmt"] #[lang = "panic_fmt"]
#[unwind] #[unwind(allowed)]
pub extern fn rust_begin_panic(msg: fmt::Arguments, pub extern fn rust_begin_panic(msg: fmt::Arguments,
file: &'static str, file: &'static str,
line: u32, line: u32,

Loading…
Cancel
Save