Unnamed repository; edit this file 'description' to name the repository.
Merge pull request #21786 from rust-lang/rustc-pull
minor: sync from downstream
| -rw-r--r-- | crates/hir-expand/src/inert_attr_macro.rs | 9 | ||||
| -rw-r--r-- | rust-version | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/crates/hir-expand/src/inert_attr_macro.rs b/crates/hir-expand/src/inert_attr_macro.rs index 6dec2c5b32..53b624d9a6 100644 --- a/crates/hir-expand/src/inert_attr_macro.rs +++ b/crates/hir-expand/src/inert_attr_macro.rs @@ -124,8 +124,6 @@ pub const INERT_ATTRIBUTES: &[BuiltinAttribute] = &[ should_panic, Normal, template!(Word, List: r#"expected = "reason""#, NameValueStr: "reason"), FutureWarnFollowing, ), - // FIXME(Centril): This can be used on stable but shouldn't. - ungated!(reexport_test_harness_main, CrateLevel, template!(NameValueStr: "name"), ErrorFollowing), // Macros: ungated!(automatically_derived, Normal, template!(Word), WarnFollowing), @@ -264,6 +262,13 @@ pub const INERT_ATTRIBUTES: &[BuiltinAttribute] = &[ test_runner, CrateLevel, template!(List: "path"), ErrorFollowing, custom_test_frameworks, "custom test frameworks are an unstable feature", ), + + gated!( + reexport_test_harness_main, CrateLevel, template!(NameValueStr: "name"), + ErrorFollowing, custom_test_frameworks, + "custom test frameworks are an unstable feature", + ), + // RFC #1268 gated!( marker, Normal, template!(Word), WarnFollowing, @only_local: true, diff --git a/rust-version b/rust-version index 7c89bcb9ab..db9492636f 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -f8704be04fe1150527fc2cf21dd44327f0fe87fb +eda4fc7733ee89e484d7120cafbd80dcb2fce66e |