Skip to content

Commit 9c1665d

Browse files
committedDec 26, 2023
Auto merge of rust-lang#116088 - nbdd0121:unwind, r=<try>
Stabilise `c_unwind` Fix rust-lang#74990 Fix rust-lang#115285 Marking as draft PR for now due to `compiler_builtins` issues r? `@Amanieu`
2 parents 2fe50cd + 05c9434 commit 9c1665d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+40
-141
lines changed
 

‎compiler/rustc_feature/src/accepted.rs

+2
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ declare_features! (
7878
(accepted, braced_empty_structs, "1.8.0", Some(29720)),
7979
/// Allows `c"foo"` literals.
8080
(accepted, c_str_literals, "1.76.0", Some(105723)),
81+
/// Allows `extern "C-unwind" fn` to enable unwinding across ABI boundaries and treat `extern "C" fn` as nounwind.
82+
(accepted, c_unwind, "CURRENT_RUSTC_VERSION", Some(74990)),
8183
/// Allows `#[cfg_attr(predicate, multiple, attributes, here)]`.
8284
(accepted, cfg_attr_multi, "1.33.0", Some(54881)),
8385
/// Allows the use of `#[cfg(doctest)]`, set when rustdoc is collecting doctests.

‎compiler/rustc_feature/src/unstable.rs

-2
Original file line numberDiff line numberDiff line change
@@ -361,8 +361,6 @@ declare_features! (
361361
(unstable, async_for_loop, "CURRENT_RUSTC_VERSION", Some(118898)),
362362
/// Allows builtin # foo() syntax
363363
(unstable, builtin_syntax, "1.71.0", Some(110680)),
364-
/// Treat `extern "C"` function as nounwind.
365-
(unstable, c_unwind, "1.52.0", Some(74990)),
366364
/// Allows using C-variadics.
367365
(unstable, c_variadic, "1.34.0", Some(44930)),
368366
/// Allows the use of `#[cfg(overflow_checks)` to check if integer overflow behaviour.

0 commit comments

Comments
 (0)