about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2022-02-19 06:45:29 +0100
committerGitHub <noreply@github.com>2022-02-19 06:45:29 +0100
commitf19adc7acc649ad2b18b6e172b683ebadb3d8a92 (patch)
tree4cd6e4c2d2b978efce0edd9d4d12e2268195a2b2 /src
parent4fa71ed0f0589133a3ab4a565d572f2c5373fad0 (diff)
parentdbeab9c532080a52f5cc86fbb4ca679581b866fd (diff)
downloadrust-f19adc7acc649ad2b18b6e172b683ebadb3d8a92.tar.gz
rust-f19adc7acc649ad2b18b6e172b683ebadb3d8a92.zip
Rollup merge of #93658 - cchiw:issue-77443-fix, r=joshtriplett
Stabilize `#[cfg(panic = "...")]`

[Stabilization PR](https://rustc-dev-guide.rust-lang.org/stabilization_guide.html#stabilization-pr) for #77443
Diffstat (limited to 'src')
-rw-r--r--src/doc/unstable-book/src/language-features/cfg-panic.md38
-rw-r--r--src/test/ui/cfg/cfg-panic-abort.rs2
-rw-r--r--src/test/ui/cfg/cfg-panic.rs2
-rw-r--r--src/test/ui/feature-gates/feature-gate-cfg-panic.rs11
-rw-r--r--src/test/ui/feature-gates/feature-gate-cfg-panic.stderr21
-rw-r--r--src/test/ui/fmt/format-args-capture.rs1
-rw-r--r--src/test/ui/issues/issue-68696-catch-during-unwind.rs1
7 files changed, 2 insertions, 74 deletions
diff --git a/src/doc/unstable-book/src/language-features/cfg-panic.md b/src/doc/unstable-book/src/language-features/cfg-panic.md
deleted file mode 100644
index f5b73128ad6..00000000000
--- a/src/doc/unstable-book/src/language-features/cfg-panic.md
+++ /dev/null
@@ -1,38 +0,0 @@
-# `cfg_panic`
-
-The tracking issue for this feature is: [#77443]
-
-[#77443]: https://github.com/rust-lang/rust/issues/77443
-
-------------------------
-
-The `cfg_panic` feature makes it possible to execute different code
-depending on the panic strategy.
-
-Possible values at the moment are `"unwind"` or `"abort"`, although
-it is possible that new panic strategies may be added to Rust in the
-future.
-
-## Examples
-
-```rust
-#![feature(cfg_panic)]
-
-#[cfg(panic = "unwind")]
-fn a() {
-    // ...
-}
-
-#[cfg(not(panic = "unwind"))]
-fn a() {
-    // ...
-}
-
-fn b() {
-    if cfg!(panic = "abort") {
-        // ...
-    } else {
-        // ...
-    }
-}
-```
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/feature-gates/feature-gate-cfg-panic.rs b/src/test/ui/feature-gates/feature-gate-cfg-panic.rs
deleted file mode 100644
index 1508374d942..00000000000
--- a/src/test/ui/feature-gates/feature-gate-cfg-panic.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#[cfg(panic = "unwind")]
-//~^ ERROR `cfg(panic)` is experimental and subject to change
-fn foo() -> bool { true }
-#[cfg(not(panic = "unwind"))]
-//~^ ERROR `cfg(panic)` is experimental and subject to change
-fn foo() -> bool { false }
-
-
-fn main() {
-    assert!(foo());
-}
diff --git a/src/test/ui/feature-gates/feature-gate-cfg-panic.stderr b/src/test/ui/feature-gates/feature-gate-cfg-panic.stderr
deleted file mode 100644
index ea5cd54fa90..00000000000
--- a/src/test/ui/feature-gates/feature-gate-cfg-panic.stderr
+++ /dev/null
@@ -1,21 +0,0 @@
-error[E0658]: `cfg(panic)` is experimental and subject to change
-  --> $DIR/feature-gate-cfg-panic.rs:1:7
-   |
-LL | #[cfg(panic = "unwind")]
-   |       ^^^^^^^^^^^^^^^^
-   |
-   = note: see issue #77443 <https://github.com/rust-lang/rust/issues/77443> for more information
-   = help: add `#![feature(cfg_panic)]` to the crate attributes to enable
-
-error[E0658]: `cfg(panic)` is experimental and subject to change
-  --> $DIR/feature-gate-cfg-panic.rs:4:11
-   |
-LL | #[cfg(not(panic = "unwind"))]
-   |           ^^^^^^^^^^^^^^^^
-   |
-   = note: see issue #77443 <https://github.com/rust-lang/rust/issues/77443> for more information
-   = help: add `#![feature(cfg_panic)]` to the crate attributes to enable
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0658`.
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;