diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2018-02-20 13:24:50 -0500 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2018-02-20 16:16:26 -0500 |
| commit | 61c2258aa0047124ad22b06d00a489644e78cbb1 (patch) | |
| tree | 5e968b273156fdcbdd9a091aba89de81f36cd058 | |
| parent | 1e8fbb1432cc124ba6687c95dc64ed5d21156d6e (diff) | |
temporarily disable rust-lang/rust#46833 due to rust-lang/rust#48251
| -rw-r--r-- | src/librustc_mir/build/mod.rs | 4 | ||||
| -rw-r--r-- | src/test/run-pass/abort-on-c-abi.rs | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/librustc_mir/build/mod.rs b/src/librustc_mir/build/mod.rs index 57059cd31a1..9778fdc8d51 100644 --- a/src/librustc_mir/build/mod.rs +++ b/src/librustc_mir/build/mod.rs @@ -372,7 +372,9 @@ fn should_abort_on_panic<'a, 'gcx, 'tcx>(tcx: TyCtxt<'a, 'gcx, 'tcx>, // unwind anyway. Don't stop them. if tcx.has_attr(tcx.hir.local_def_id(fn_id), "unwind") { return false; } - return true; + // FIXME(rust-lang/rust#48251) -- Had to disable abort-on-panic + // for backwardsa compatibility reasons. + false } /////////////////////////////////////////////////////////////////////////// diff --git a/src/test/run-pass/abort-on-c-abi.rs b/src/test/run-pass/abort-on-c-abi.rs index 17661c0b120..bf2abf6fcc4 100644 --- a/src/test/run-pass/abort-on-c-abi.rs +++ b/src/test/run-pass/abort-on-c-abi.rs @@ -13,6 +13,7 @@ // ignore-cloudabi no env and process // ignore-emscripten no processes +// ignore-test FIXME rust-lang/rust#48251 -- temporarily disabled use std::{env, panic}; use std::io::prelude::*; |