Skip to content

Commit 6d88afe

Browse files
committed
Auto merge of #30015 - petrochenkov:staged, r=brson
Closes #30008 `#[stable]`, `#[unstable]` and `#[rustc_deprecated]` are now guarded by `#[feature(staged_api)]` r? @brson
2 parents 1805bba + 4b80784 commit 6d88afe

File tree

58 files changed

+47
-84
lines changed

Some content is hidden

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

58 files changed

+47
-84
lines changed

src/doc/reference.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2325,10 +2325,6 @@ The currently implemented features of the reference compiler are:
23252325
* `simd_ffi` - Allows use of SIMD vectors in signatures for foreign functions.
23262326
The SIMD interface is subject to change.
23272327

2328-
* `staged_api` - Allows usage of stability markers and `#![staged_api]` in a
2329-
crate. Stability markers are also attributes: `#[stable]`,
2330-
`#[unstable]`, and `#[rustc_deprecated]` are the three levels.
2331-
23322328
* `start` - Allows use of the `#[start]` attribute, which changes the entry point
23332329
into a Rust program. This capability, especially the signature for the
23342330
annotated function, is subject to change.

src/liballoc/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
#![cfg_attr(stage0, feature(custom_attribute))]
6161
#![crate_name = "alloc"]
6262
#![crate_type = "rlib"]
63-
#![staged_api]
63+
#![cfg_attr(stage0, staged_api)]
6464
#![allow(unused_attributes)]
6565
#![unstable(feature = "alloc",
6666
reason = "this library is unlikely to be stabilized in its current \

src/liballoc_jemalloc/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#![cfg_attr(stage0, feature(custom_attribute))]
1212
#![crate_name = "alloc_jemalloc"]
1313
#![crate_type = "rlib"]
14-
#![staged_api]
14+
#![cfg_attr(stage0, staged_api)]
1515
#![no_std]
1616
#![cfg_attr(not(stage0), allocator)]
1717
#![cfg_attr(stage0, allow(improper_ctypes))]

src/liballoc_system/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#![cfg_attr(stage0, feature(custom_attribute))]
1212
#![crate_name = "alloc_system"]
1313
#![crate_type = "rlib"]
14-
#![staged_api]
14+
#![cfg_attr(stage0, staged_api)]
1515
#![no_std]
1616
#![cfg_attr(not(stage0), allocator)]
1717
#![cfg_attr(stage0, allow(improper_ctypes))]

src/libarena/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#![cfg_attr(stage0, feature(custom_attribute))]
2424
#![crate_name = "arena"]
2525
#![unstable(feature = "rustc_private", issue = "27812")]
26-
#![staged_api]
26+
#![cfg_attr(stage0, staged_api)]
2727
#![crate_type = "rlib"]
2828
#![crate_type = "dylib"]
2929
#![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",

src/libcollections/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
// Do not remove on snapshot creation. Needed for bootstrap. (Issue #22364)
1717
#![cfg_attr(stage0, feature(custom_attribute))]
1818
#![crate_name = "collections"]
19-
#![staged_api]
19+
#![cfg_attr(stage0, staged_api)]
2020
#![crate_type = "rlib"]
2121
#![unstable(feature = "collections",
2222
reason = "library is unlikely to be stabilized with the current \

src/libcore/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
reason = "the libcore library has not yet been scrutinized for \
5757
stabilization in terms of structure and naming",
5858
issue = "27701")]
59-
#![staged_api]
59+
#![cfg_attr(stage0, staged_api)]
6060
#![crate_type = "rlib"]
6161
#![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
6262
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",

src/libflate/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#![cfg_attr(stage0, feature(custom_attribute))]
1919
#![crate_name = "flate"]
2020
#![unstable(feature = "rustc_private", issue = "27812")]
21-
#![staged_api]
21+
#![cfg_attr(stage0, staged_api)]
2222
#![crate_type = "rlib"]
2323
#![crate_type = "dylib"]
2424
#![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",

src/libfmt_macros/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#![cfg_attr(stage0, feature(custom_attribute))]
1919
#![crate_name = "fmt_macros"]
2020
#![unstable(feature = "rustc_private", issue = "27812")]
21-
#![staged_api]
21+
#![cfg_attr(stage0, staged_api)]
2222
#![crate_type = "rlib"]
2323
#![crate_type = "dylib"]
2424
#![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",

src/libgetopts/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
#![unstable(feature = "rustc_private",
8585
reason = "use the crates.io `getopts` library instead",
8686
issue = "27812")]
87-
#![staged_api]
87+
#![cfg_attr(stage0, staged_api)]
8888
#![crate_type = "rlib"]
8989
#![crate_type = "dylib"]
9090
#![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",

0 commit comments

Comments
 (0)