]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #102458 - JohnTitor:stabilize-instruction-set, r=oli-obk
authorbors <bors@rust-lang.org>
Sat, 5 Nov 2022 20:39:06 +0000 (20:39 +0000)
committerbors <bors@rust-lang.org>
Sat, 5 Nov 2022 20:39:06 +0000 (20:39 +0000)
Stabilize the `instruction_set` feature

Closes https://github.com/rust-lang/rust/issues/74727
FCP is complete on https://github.com/rust-lang/rust/issues/74727#issuecomment-1242773253
r? `@pnkfelix` and/or `@nikomatsakis`
cc `@xd009642`

Signed-off-by: Yuki Okushi <jtitor@2k36.org>
1  2 
compiler/rustc_feature/src/accepted.rs
compiler/rustc_feature/src/active.rs
compiler/rustc_feature/src/builtin_attrs.rs

Simple merge
index 14c8e3c458c497a241673ea10558f5298363f059,3c62bdcaadbdc607b52cb6944ced38c5b796f5c2..4ff3b3f2a38b35860985486a174bdccdd898a154
@@@ -386,11 -382,9 +386,12 @@@ pub const BUILTIN_ATTRIBUTES: &[Builtin
      ungated!(inline, Normal, template!(Word, List: "always|never"), FutureWarnFollowing, @only_local: true),
      ungated!(cold, Normal, template!(Word), WarnFollowing, @only_local: true),
      ungated!(no_builtins, CrateLevel, template!(Word), WarnFollowing),
 -    ungated!(target_feature, Normal, template!(List: r#"enable = "name""#), DuplicatesOk),
 +    ungated!(
 +        target_feature, Normal, template!(List: r#"enable = "name""#),
 +        DuplicatesOk, @only_local: true,
 +    ),
      ungated!(track_caller, Normal, template!(Word), WarnFollowing),
+     ungated!(instruction_set, Normal, template!(List: "set"), ErrorPreceding),
      gated!(
          no_sanitize, Normal,
          template!(List: "address, memory, thread"), DuplicatesOk,