Skip to content

Commit f19adc7

Browse files
authored
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
2 parents 4fa71ed + dbeab9c commit f19adc7

File tree

11 files changed

+5
-78
lines changed

11 files changed

+5
-78
lines changed

compiler/rustc_feature/src/accepted.rs

+2
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ declare_features! (
7070
(accepted, cfg_attr_multi, "1.33.0", Some(54881), None),
7171
/// Allows the use of `#[cfg(doctest)]`, set when rustdoc is collecting doctests.
7272
(accepted, cfg_doctest, "1.40.0", Some(62210), None),
73+
/// Enables `#[cfg(panic = "...")]` config key.
74+
(accepted, cfg_panic, "1.60.0", Some(77443), None),
7375
/// Allows `cfg(target_feature = "...")`.
7476
(accepted, cfg_target_feature, "1.27.0", Some(29717), None),
7577
/// Allows `cfg(target_vendor = "...")`.

compiler/rustc_feature/src/active.rs

-2
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,6 @@ declare_features! (
306306
(active, c_variadic, "1.34.0", Some(44930), None),
307307
/// Allows capturing disjoint fields in a closure/generator (RFC 2229).
308308
(incomplete, capture_disjoint_fields, "1.49.0", Some(53488), None),
309-
/// Enables `#[cfg(panic = "...")]` config key.
310-
(active, cfg_panic, "1.49.0", Some(77443), None),
311309
/// Allows the use of `#[cfg(sanitize = "option")]`; set when -Zsanitizer is used.
312310
(active, cfg_sanitize, "1.41.0", Some(39699), None),
313311
/// Allows `cfg(target_abi = "...")`.

compiler/rustc_feature/src/builtin_attrs.rs

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ const GATED_CFGS: &[GatedCfg] = &[
3434
(sym::target_has_atomic_load_store, sym::cfg_target_has_atomic, cfg_fn!(cfg_target_has_atomic)),
3535
(sym::sanitize, sym::cfg_sanitize, cfg_fn!(cfg_sanitize)),
3636
(sym::version, sym::cfg_version, cfg_fn!(cfg_version)),
37-
(sym::panic, sym::cfg_panic, cfg_fn!(cfg_panic)),
3837
];
3938

4039
/// Find a gated cfg determined by the `pred`icate which is given the cfg's name.

library/core/tests/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#![feature(bool_to_option)]
77
#![feature(box_syntax)]
88
#![feature(cell_update)]
9-
#![feature(cfg_panic)]
9+
#![cfg_attr(bootstrap, feature(cfg_panic))]
1010
#![cfg_attr(bootstrap, feature(cfg_target_has_atomic))]
1111
#![feature(const_assume)]
1212
#![feature(const_black_box)]

src/doc/unstable-book/src/language-features/cfg-panic.md

-38
This file was deleted.

src/test/ui/cfg/cfg-panic-abort.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// build-pass
22
// compile-flags: -C panic=abort
33
// no-prefer-dynamic
4-
#![feature(cfg_panic)]
4+
55

66
#[cfg(panic = "unwind")]
77
pub fn bad() -> i32 { }

src/test/ui/cfg/cfg-panic.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// ignore-emscripten no panic_unwind implementation
55
// ignore-wasm32 no panic_unwind implementation
66
// ignore-wasm64 no panic_unwind implementation
7-
#![feature(cfg_panic)]
7+
88

99
#[cfg(panic = "abort")]
1010
pub fn bad() -> i32 { }

src/test/ui/feature-gates/feature-gate-cfg-panic.rs

-11
This file was deleted.

src/test/ui/feature-gates/feature-gate-cfg-panic.stderr

-21
This file was deleted.

src/test/ui/fmt/format-args-capture.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// run-pass
2-
#![feature(cfg_panic)]
32

43
fn main() {
54
named_argument_takes_precedence_to_captured();

src/test/ui/issues/issue-68696-catch-during-unwind.rs

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
// entering the catch_unwind.
55
//
66
// run-pass
7-
#![feature(cfg_panic)]
87

98
use std::panic::catch_unwind;
109

0 commit comments

Comments
 (0)