itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2026-03-18 20:29:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21786 from rust-lang/rustc-pull

Browse Source 
minor: sync from downstream
This commit is contained in:
Laurențiu Nicola
2026-03-09 08:32:23 +00:00
committed by GitHub
parent 833aa91b0d 8a6869d15a
commit 2cf461f697
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
crates/hir-expand/src/inert_attr_macro.rs
View File

@@ -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,

2
rust-version
View File

@@ -1 +1 @@
f8704be04fe1150527fc2cf21dd44327f0fe87fb
eda4fc7733ee89e484d7120cafbd80dcb2fce66e