diff options
| author | bors <bors@rust-lang.org> | 2016-11-09 18:22:47 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-09 18:22:47 -0800 |
| commit | b46ce08df51f95e5d9f6dff9156b1d8e38cf4795 (patch) | |
| tree | 605693ae8861f9ce5371e3ad076f6013e2a37fc6 /src/libpanic_abort | |
| parent | 0b46947d35e9fdc35cd06dd889c3c3a892d7ddf8 (diff) | |
| parent | 3a5b45aae5142635e2b14c139a69c684bf3f1a19 (diff) | |
Auto merge of #37678 - eddyb:rollup, r=eddyb
Rollup of 5 pull requests - Successful merges: #37402, #37412, #37661, #37664, #37667 - Failed merges:
Diffstat (limited to 'src/libpanic_abort')
| -rw-r--r-- | src/libpanic_abort/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libpanic_abort/lib.rs b/src/libpanic_abort/lib.rs index b87160dd75d..853f81ceaa9 100644 --- a/src/libpanic_abort/lib.rs +++ b/src/libpanic_abort/lib.rs @@ -53,7 +53,7 @@ pub unsafe extern fn __rust_maybe_catch_panic(f: fn(*mut u8), // now hopefully. #[no_mangle] pub unsafe extern fn __rust_start_panic(_data: usize, _vtable: usize) -> u32 { - return abort(); + abort(); #[cfg(unix)] unsafe fn abort() -> ! { |