diff options
| author | Charisee <chiw@google.com> | 2022-02-04 17:14:58 +0000 |
|---|---|---|
| committer | Charisee <chiw@google.com> | 2022-02-10 22:06:47 +0000 |
| commit | 5e6be7df942e984d3d5388eb04d2a40d49fb8473 (patch) | |
| tree | 637ae48acdfdfb09f65087a6e65f717c488c4256 | |
| parent | 4404a4e365fb7090585e23f9d54110f214888f39 (diff) | |
| download | rust-5e6be7df942e984d3d5388eb04d2a40d49fb8473.tar.gz rust-5e6be7df942e984d3d5388eb04d2a40d49fb8473.zip | |
replace feature expression (cfg_panic) in lib and remove expression from tests
Rebase commit
| -rw-r--r-- | library/core/tests/lib.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/cfg/cfg-panic-abort.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/cfg/cfg-panic.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/fmt/format-args-capture.rs | 1 | ||||
| -rw-r--r-- | src/test/ui/issues/issue-68696-catch-during-unwind.rs | 1 |
5 files changed, 3 insertions, 5 deletions
diff --git a/library/core/tests/lib.rs b/library/core/tests/lib.rs index 1c512471c95..d439a8d7de4 100644 --- a/library/core/tests/lib.rs +++ b/library/core/tests/lib.rs @@ -6,7 +6,7 @@ #![feature(bool_to_option)] #![feature(box_syntax)] #![feature(cell_update)] -#![feature(cfg_panic)] +#![cfg_attr(bootstrap,feature(cfg_panic))] #![cfg_attr(bootstrap, feature(cfg_target_has_atomic))] #![feature(const_assume)] #![feature(const_black_box)] diff --git a/src/test/ui/cfg/cfg-panic-abort.rs b/src/test/ui/cfg/cfg-panic-abort.rs index 9b88eff12ed..3853b598a7a 100644 --- a/src/test/ui/cfg/cfg-panic-abort.rs +++ b/src/test/ui/cfg/cfg-panic-abort.rs @@ -1,7 +1,7 @@ // build-pass // compile-flags: -C panic=abort // no-prefer-dynamic -#![feature(cfg_panic)] + #[cfg(panic = "unwind")] pub fn bad() -> i32 { } diff --git a/src/test/ui/cfg/cfg-panic.rs b/src/test/ui/cfg/cfg-panic.rs index d2113e4f5ec..fb3e5059c81 100644 --- a/src/test/ui/cfg/cfg-panic.rs +++ b/src/test/ui/cfg/cfg-panic.rs @@ -4,7 +4,7 @@ // ignore-emscripten no panic_unwind implementation // ignore-wasm32 no panic_unwind implementation // ignore-wasm64 no panic_unwind implementation -#![feature(cfg_panic)] + #[cfg(panic = "abort")] pub fn bad() -> i32 { } diff --git a/src/test/ui/fmt/format-args-capture.rs b/src/test/ui/fmt/format-args-capture.rs index d31d2a6c336..560352b5cb9 100644 --- a/src/test/ui/fmt/format-args-capture.rs +++ b/src/test/ui/fmt/format-args-capture.rs @@ -1,5 +1,4 @@ // run-pass -#![feature(cfg_panic)] fn main() { named_argument_takes_precedence_to_captured(); diff --git a/src/test/ui/issues/issue-68696-catch-during-unwind.rs b/src/test/ui/issues/issue-68696-catch-during-unwind.rs index f25a78f59cd..2b12a62d0eb 100644 --- a/src/test/ui/issues/issue-68696-catch-during-unwind.rs +++ b/src/test/ui/issues/issue-68696-catch-during-unwind.rs @@ -4,7 +4,6 @@ // entering the catch_unwind. // // run-pass -#![feature(cfg_panic)] use std::panic::catch_unwind; |