diff options
| author | Jeremy Soller <jackpot51@gmail.com> | 2016-11-10 20:37:34 -0700 |
|---|---|---|
| committer | Jeremy Soller <jackpot51@gmail.com> | 2016-11-10 20:37:34 -0700 |
| commit | 0bb9a959074bb7f027cf05a240a0044116fa0ab0 (patch) | |
| tree | 69fca65cd12f30f97f8bcfd403b39577f2ce3c57 /src/libpanic_abort | |
| parent | 25e1a4a0084a56807d7a1e4ca676e078c085b3aa (diff) | |
| parent | 1473007618e6ab85a994f86348acdaf125b7914f (diff) | |
Merge branch 'master' into redox
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 26bc46931bd..8f85bfe2c63 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() -> ! { |