Unnamed repository; edit this file 'description' to name the repository.
Merge ref 'eda4fc7733ee' from rust-lang/rust
Pull recent changes from https://github.com/rust-lang/rust via Josh.
Upstream ref: rust-lang/rust@eda4fc7733ee89e484d7120cafbd80dcb2fce66e
Filtered ref: rust-lang/rust-analyzer@18005ba4c5da1f89bf8d36b86cd70dfcd2720c8c
Upstream diff: https://github.com/rust-lang/rust/compare/f8704be04fe1150527fc2cf21dd44327f0fe87fb...eda4fc7733ee89e484d7120cafbd80dcb2fce66e
This merge was created using https://github.com/rust-lang/josh-sync.
| -rw-r--r-- | crates/hir-expand/src/inert_attr_macro.rs | 9 |
1 files changed, 7 insertions, 2 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, |