diff options
| author | bors <bors@rust-lang.org> | 2024-07-14 10:22:01 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-07-14 10:22:01 +0000 |
| commit | a241cf1c49c46c57ee2ea9b19df4e7e2cc41449d (patch) | |
| tree | 3b0fcc4c9c6c90accde290b933733579a9de519b /compiler | |
| parent | 0ffbddd09e02a00b762d838ea1598bfa89dd1668 (diff) | |
| parent | 82f13e721570f116b34cfe4014fc9915e95fc7aa (diff) | |
| download | rust-a241cf1c49c46c57ee2ea9b19df4e7e2cc41449d.tar.gz rust-a241cf1c49c46c57ee2ea9b19df4e7e2cc41449d.zip | |
Auto merge of #127713 - matthiaskrgr:rollup-zxlyexf, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #127083 (Add release notes for 1.80) - #127322 (handle ci-rustc incompatible options during config parse) - #127697 (use std for file mtime and atime modifications) - #127704 (Fix minor typos in std::process doc on Win argv) - #127710 (clarify the meaning of the version number for accepted/removed features) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/rustc_feature/src/accepted.rs | 4 | ||||
| -rw-r--r-- | compiler/rustc_feature/src/lib.rs | 4 | ||||
| -rw-r--r-- | compiler/rustc_feature/src/removed.rs | 6 |
3 files changed, 14 insertions, 0 deletions
diff --git a/compiler/rustc_feature/src/accepted.rs b/compiler/rustc_feature/src/accepted.rs index f082cc2b569..e671c768239 100644 --- a/compiler/rustc_feature/src/accepted.rs +++ b/compiler/rustc_feature/src/accepted.rs @@ -42,6 +42,10 @@ declare_features! ( // feature-group-start: accepted features // ------------------------------------------------------------------------- + // Note that the version indicates when it got *stabilized*. + // When moving an unstable feature here, set the version number to + // `CURRENT RUSTC VERSION` with ` ` replaced by `_`. + /// Allows `#[target_feature(...)]` on aarch64 platforms (accepted, aarch64_target_feature, "1.61.0", Some(44839)), /// Allows using the `efiapi` ABI. diff --git a/compiler/rustc_feature/src/lib.rs b/compiler/rustc_feature/src/lib.rs index bf429364318..e9d3ce0a074 100644 --- a/compiler/rustc_feature/src/lib.rs +++ b/compiler/rustc_feature/src/lib.rs @@ -31,6 +31,10 @@ use std::num::NonZero; #[derive(Debug, Clone)] pub struct Feature { pub name: Symbol, + /// For unstable features: the version the feature was added in. + /// For accepted features: the version the feature got stabilized in. + /// For removed features we are inconsistent; sometimes this is the + /// version it got added, sometimes the version it got removed. pub since: &'static str, issue: Option<NonZero<u32>>, } diff --git a/compiler/rustc_feature/src/removed.rs b/compiler/rustc_feature/src/removed.rs index f13aa506c1e..80a108d2fc8 100644 --- a/compiler/rustc_feature/src/removed.rs +++ b/compiler/rustc_feature/src/removed.rs @@ -32,6 +32,12 @@ declare_features! ( // feature-group-start: removed features // ------------------------------------------------------------------------- + // Note that the version indicates when it got *removed*. + // When moving an unstable feature here, set the version number to + // `CURRENT RUSTC VERSION` with ` ` replaced by `_`. + // (But not all features below do this properly; many indicate the + // version they got originally added in.) + /// Allows using the `amdgpu-kernel` ABI. (removed, abi_amdgpu_kernel, "1.77.0", Some(51575), None), (removed, advanced_slice_patterns, "1.0.0", Some(62254), |
