Unrolled build for rust-lang#128080

rust-timer · web-flow · commit 81bed8874fb4 · 2025-02-21T13:17:14.000-05:00
Rollup merge of rust-lang#128080 - estebank:out-of-scope-macro, r=petrochenkov Specify scope in `out_of_scope_macro_calls` lint ``` warning: cannot find macro `in_root` in the crate root --> $DIR/key-value-expansion-scope.rs:1:10 | LL | #![doc = in_root!()] | ^^^^^^^ not found in the crate root | = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release! = note: for more information, see issue rust-lang#124535 <rust-lang#124535> = help: import `macro_rules` with `use` to make it callable above its definition = note: `#[warn(out_of_scope_macro_calls)]` on by default ``` r? ```@petrochenkov```
diff --git a/compiler/rustc_lint/messages.ftl b/compiler/rustc_lint/messages.ftl
@@ -630,7 +630,8 @@ lint_opaque_hidden_inferred_bound_sugg = add this bound
 lint_or_patterns_back_compat = the meaning of the `pat` fragment specifier is changing in Rust 2021, which may affect this macro
     .suggestion = use pat_param to preserve semantics
 
-lint_out_of_scope_macro_calls = cannot find macro `{$path}` in this scope
+lint_out_of_scope_macro_calls = cannot find macro `{$path}` in the current scope when looking from {$location}
+    .label = not found from {$location}
     .help = import `macro_rules` with `use` to make it callable above its definition
 
 lint_overflowing_bin_hex = literal out of range for `{$ty}`
diff --git a/compiler/rustc_lint/src/early/diagnostics.rs b/compiler/rustc_lint/src/early/diagnostics.rs
@@ -444,8 +444,8 @@ pub(super) fn decorate_lint(
             lints::InnerAttributeUnstable::CustomInnerAttribute
         }
         .decorate_lint(diag),
-        BuiltinLintDiag::OutOfScopeMacroCalls { path } => {
-            lints::OutOfScopeMacroCalls { path }.decorate_lint(diag)
+        BuiltinLintDiag::OutOfScopeMacroCalls { span, path, location } => {
+            lints::OutOfScopeMacroCalls { span, path, location }.decorate_lint(diag)
         }
         BuiltinLintDiag::UnexpectedBuiltinCfg { cfg, cfg_name, controlled_by } => {
             lints::UnexpectedBuiltinCfg { cfg, cfg_name, controlled_by }.decorate_lint(diag)
diff --git a/compiler/rustc_lint/src/lints.rs b/compiler/rustc_lint/src/lints.rs
@@ -3108,7 +3108,10 @@ pub(crate) struct UnsafeAttrOutsideUnsafeSuggestion {
 #[diag(lint_out_of_scope_macro_calls)]
 #[help]
 pub(crate) struct OutOfScopeMacroCalls {
+    #[label]
+    pub span: Span,
     pub path: String,
+    pub location: String,
 }
 
 #[derive(LintDiagnostic)]
diff --git a/compiler/rustc_lint_defs/src/lib.rs b/compiler/rustc_lint_defs/src/lib.rs
@@ -819,7 +819,9 @@ pub enum BuiltinLintDiag {
         is_macro: bool,
     },
     OutOfScopeMacroCalls {
+        span: Span,
         path: String,
+        location: String,
     },
     UnexpectedBuiltinCfg {
         cfg: String,
diff --git a/compiler/rustc_resolve/src/macros.rs b/compiler/rustc_resolve/src/macros.rs
@@ -857,8 +857,10 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
                 ),
                 path_res @ (PathResult::NonModule(..) | PathResult::Failed { .. }) => {
                     let mut suggestion = None;
-                    let (span, label, module) =
-                        if let PathResult::Failed { span, label, module, .. } = path_res {
+                    let (span, label, module, segment) =
+                        if let PathResult::Failed { span, label, module, segment_name, .. } =
+                            path_res
+                        {
                             // try to suggest if it's not a macro, maybe a function
                             if let PathResult::NonModule(partial_res) =
                                 self.maybe_resolve_path(&path, Some(ValueNS), &parent_scope, None)
@@ -876,7 +878,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
                                     Applicability::MaybeIncorrect,
                                 ));
                             }
-                            (span, label, module)
+                            (span, label, module, segment_name)
                         } else {
                             (
                                 path_span,
@@ -886,12 +888,13 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
                                     kind.descr()
                                 ),
                                 None,
+                                path.last().map(|segment| segment.ident.name).unwrap(),
                             )
                         };
                     self.report_error(
                         span,
                         ResolutionError::FailedToResolve {
-                            segment: path.last().map(|segment| segment.ident.name),
+                            segment: Some(segment),
                             label,
                             suggestion,
                             module,
@@ -1067,11 +1070,24 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
                 None,
             );
             if fallback_binding.ok().and_then(|b| b.res().opt_def_id()) != Some(def_id) {
+                let location = match parent_scope.module.kind {
+                    ModuleKind::Def(_, _, name) if name == kw::Empty => {
+                        "the crate root".to_string()
+                    }
+                    ModuleKind::Def(kind, def_id, name) => {
+                        format!("{} `{name}`", kind.descr(def_id))
+                    }
+                    ModuleKind::Block => "this scope".to_string(),
+                };
                 self.tcx.sess.psess.buffer_lint(
                     OUT_OF_SCOPE_MACRO_CALLS,
                     path.span,
                     node_id,
-                    BuiltinLintDiag::OutOfScopeMacroCalls { path: pprust::path_to_string(path) },
+                    BuiltinLintDiag::OutOfScopeMacroCalls {
+                        span: path.span,
+                        path: pprust::path_to_string(path),
+                        location,
+                    },
                 );
             }
         }
diff --git a/tests/ui/attributes/key-value-expansion-scope.rs b/tests/ui/attributes/key-value-expansion-scope.rs
@@ -1,7 +1,7 @@
-#![doc = in_root!()] //~ WARN cannot find macro `in_root` in this scope
+#![doc = in_root!()] //~ WARN cannot find macro `in_root`
                      //~| WARN this was previously accepted by the compiler
 #![doc = in_mod!()] //~ ERROR cannot find macro `in_mod` in this scope
-#![doc = in_mod_escape!()] //~ WARN cannot find macro `in_mod_escape` in this scope
+#![doc = in_mod_escape!()] //~ WARN cannot find macro `in_mod_escape`
                            //~| WARN this was previously accepted by the compiler
 #![doc = in_block!()] //~ ERROR cannot find macro `in_block` in this scope
 
@@ -18,10 +18,10 @@ fn before() {
 
 macro_rules! in_root { () => { "" } }
 
-#[doc = in_mod!()] //~ WARN cannot find macro `in_mod` in this scope
+#[doc = in_mod!()] //~ WARN cannot find macro `in_mod`
                    //~| WARN this was previously accepted by the compiler
 mod macros_stay {
-    #![doc = in_mod!()] //~ WARN cannot find macro `in_mod` in this scope
+    #![doc = in_mod!()] //~ WARN cannot find macro `in_mod`
                         //~| WARN this was previously accepted by the compiler
 
     macro_rules! in_mod { () => { "" } }
@@ -33,10 +33,10 @@ mod macros_stay {
 }
 
 #[macro_use]
-#[doc = in_mod_escape!()] //~ WARN cannot find macro `in_mod_escape` in this scope
+#[doc = in_mod_escape!()] //~ WARN cannot find macro `in_mod_escape`
                           //~| WARN this was previously accepted by the compiler
 mod macros_escape {
-    #![doc = in_mod_escape!()] //~ WARN cannot find macro `in_mod_escape` in this scope
+    #![doc = in_mod_escape!()] //~ WARN cannot find macro `in_mod_escape`
                                //~| WARN this was previously accepted by the compiler
 
     macro_rules! in_mod_escape { () => { "" } }
diff --git a/tests/ui/attributes/key-value-expansion-scope.stderr b/tests/ui/attributes/key-value-expansion-scope.stderr
@@ -126,62 +126,62 @@ LL |     #![doc = in_block!()]
    |
    = help: have you added the `#[macro_use]` on the module/import?
 
-warning: cannot find macro `in_root` in this scope
+warning: cannot find macro `in_root` in the current scope when looking from the crate root
   --> $DIR/key-value-expansion-scope.rs:1:10
    |
 LL | #![doc = in_root!()]
-   |          ^^^^^^^
+   |          ^^^^^^^ not found from the crate root
    |
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #124535 <https://github.com/rust-lang/rust/issues/124535>
    = help: import `macro_rules` with `use` to make it callable above its definition
    = note: `#[warn(out_of_scope_macro_calls)]` on by default
 
-warning: cannot find macro `in_mod_escape` in this scope
+warning: cannot find macro `in_mod_escape` in the current scope when looking from the crate root
   --> $DIR/key-value-expansion-scope.rs:4:10
    |
 LL | #![doc = in_mod_escape!()]
-   |          ^^^^^^^^^^^^^
+   |          ^^^^^^^^^^^^^ not found from the crate root
    |
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #124535 <https://github.com/rust-lang/rust/issues/124535>
    = help: import `macro_rules` with `use` to make it callable above its definition
 
-warning: cannot find macro `in_mod` in this scope
+warning: cannot find macro `in_mod` in the current scope when looking from module `macros_stay`
   --> $DIR/key-value-expansion-scope.rs:21:9
    |
 LL | #[doc = in_mod!()]
-   |         ^^^^^^
+   |         ^^^^^^ not found from module `macros_stay`
    |
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #124535 <https://github.com/rust-lang/rust/issues/124535>
    = help: import `macro_rules` with `use` to make it callable above its definition
 
-warning: cannot find macro `in_mod` in this scope
+warning: cannot find macro `in_mod` in the current scope when looking from module `macros_stay`
   --> $DIR/key-value-expansion-scope.rs:24:14
    |
 LL |     #![doc = in_mod!()]
-   |              ^^^^^^
+   |              ^^^^^^ not found from module `macros_stay`
    |
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #124535 <https://github.com/rust-lang/rust/issues/124535>
    = help: import `macro_rules` with `use` to make it callable above its definition
 
-warning: cannot find macro `in_mod_escape` in this scope
+warning: cannot find macro `in_mod_escape` in the current scope when looking from module `macros_escape`
   --> $DIR/key-value-expansion-scope.rs:36:9
    |
 LL | #[doc = in_mod_escape!()]
-   |         ^^^^^^^^^^^^^
+   |         ^^^^^^^^^^^^^ not found from module `macros_escape`
    |
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #124535 <https://github.com/rust-lang/rust/issues/124535>
    = help: import `macro_rules` with `use` to make it callable above its definition
 
-warning: cannot find macro `in_mod_escape` in this scope
+warning: cannot find macro `in_mod_escape` in the current scope when looking from module `macros_escape`
   --> $DIR/key-value-expansion-scope.rs:39:14
    |
 LL |     #![doc = in_mod_escape!()]
-   |              ^^^^^^^^^^^^^
+   |              ^^^^^^^^^^^^^ not found from module `macros_escape`
    |
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #124535 <https://github.com/rust-lang/rust/issues/124535>

Original file line number	Diff line number	Diff line change
`@@ -444,8 +444,8 @@ pub(super) fn decorate_lint(`
`444`	`444`	`lints::InnerAttributeUnstable::CustomInnerAttribute`
`445`	`445`	`}`
`446`	`446`	`.decorate_lint(diag),`
`447`		`- BuiltinLintDiag::OutOfScopeMacroCalls { path } => {`
`448`		`- lints::OutOfScopeMacroCalls { path }.decorate_lint(diag)`
	`447`	`+ BuiltinLintDiag::OutOfScopeMacroCalls { span, path, location } => {`
	`448`	`+ lints::OutOfScopeMacroCalls { span, path, location }.decorate_lint(diag)`
`449`	`449`	`}`
`450`	`450`	`BuiltinLintDiag::UnexpectedBuiltinCfg { cfg, cfg_name, controlled_by } => {`
`451`	`451`	`lints::UnexpectedBuiltinCfg { cfg, cfg_name, controlled_by }.decorate_lint(diag)`
Original file line number	Diff line number	Diff line change
`@@ -126,62 +126,62 @@ LL \| #![doc = in_block!()]`
`126`	`126`	`\|`
`127`	`127`	= help: have you added the `#[macro_use]` on the module/import?
`128`	`128`
`129`		-warning: cannot find macro `in_root` in this scope
	`129`	+warning: cannot find macro `in_root` in the current scope when looking from the crate root
`130`	`130`	`--> $DIR/key-value-expansion-scope.rs:1:10`
`131`	`131`	`\|`
`132`	`132`	`LL \| #![doc = in_root!()]`
`133`		`- \| ^^^^^^^`
	`133`	`+ \| ^^^^^^^ not found from the crate root`
`134`	`134`	`\|`
`135`	`135`	`= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!`
`136`	`136`	`= note: for more information, see issue #124535 <https://github.com/rust-lang/rust/issues/124535>`
`137`	`137`	= help: import `macro_rules` with `use` to make it callable above its definition
`138`	`138`	= note: `#[warn(out_of_scope_macro_calls)]` on by default
`139`	`139`
`140`		-warning: cannot find macro `in_mod_escape` in this scope
	`140`	+warning: cannot find macro `in_mod_escape` in the current scope when looking from the crate root
`141`	`141`	`--> $DIR/key-value-expansion-scope.rs:4:10`
`142`	`142`	`\|`
`143`	`143`	`LL \| #![doc = in_mod_escape!()]`
`144`		`- \| ^^^^^^^^^^^^^`
	`144`	`+ \| ^^^^^^^^^^^^^ not found from the crate root`
`145`	`145`	`\|`
`146`	`146`	`= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!`
`147`	`147`	`= note: for more information, see issue #124535 <https://github.com/rust-lang/rust/issues/124535>`
`148`	`148`	= help: import `macro_rules` with `use` to make it callable above its definition
`149`	`149`
`150`		-warning: cannot find macro `in_mod` in this scope
	`150`	+warning: cannot find macro `in_mod` in the current scope when looking from module `macros_stay`
`151`	`151`	`--> $DIR/key-value-expansion-scope.rs:21:9`
`152`	`152`	`\|`
`153`	`153`	`LL \| #[doc = in_mod!()]`
`154`		`- \| ^^^^^^`
	`154`	+ \| ^^^^^^ not found from module `macros_stay`
`155`	`155`	`\|`
`156`	`156`	`= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!`
`157`	`157`	`= note: for more information, see issue #124535 <https://github.com/rust-lang/rust/issues/124535>`
`158`	`158`	= help: import `macro_rules` with `use` to make it callable above its definition
`159`	`159`
`160`		-warning: cannot find macro `in_mod` in this scope
	`160`	+warning: cannot find macro `in_mod` in the current scope when looking from module `macros_stay`
`161`	`161`	`--> $DIR/key-value-expansion-scope.rs:24:14`
`162`	`162`	`\|`
`163`	`163`	`LL \| #![doc = in_mod!()]`
`164`		`- \| ^^^^^^`
	`164`	+ \| ^^^^^^ not found from module `macros_stay`
`165`	`165`	`\|`
`166`	`166`	`= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!`
`167`	`167`	`= note: for more information, see issue #124535 <https://github.com/rust-lang/rust/issues/124535>`
`168`	`168`	= help: import `macro_rules` with `use` to make it callable above its definition
`169`	`169`
`170`		-warning: cannot find macro `in_mod_escape` in this scope
	`170`	+warning: cannot find macro `in_mod_escape` in the current scope when looking from module `macros_escape`
`171`	`171`	`--> $DIR/key-value-expansion-scope.rs:36:9`
`172`	`172`	`\|`
`173`	`173`	`LL \| #[doc = in_mod_escape!()]`
`174`		`- \| ^^^^^^^^^^^^^`
	`174`	+ \| ^^^^^^^^^^^^^ not found from module `macros_escape`
`175`	`175`	`\|`
`176`	`176`	`= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!`
`177`	`177`	`= note: for more information, see issue #124535 <https://github.com/rust-lang/rust/issues/124535>`
`178`	`178`	= help: import `macro_rules` with `use` to make it callable above its definition
`179`	`179`
`180`		-warning: cannot find macro `in_mod_escape` in this scope
	`180`	+warning: cannot find macro `in_mod_escape` in the current scope when looking from module `macros_escape`
`181`	`181`	`--> $DIR/key-value-expansion-scope.rs:39:14`
`182`	`182`	`\|`
`183`	`183`	`LL \| #![doc = in_mod_escape!()]`
`184`		`- \| ^^^^^^^^^^^^^`
	`184`	+ \| ^^^^^^^^^^^^^ not found from module `macros_escape`
`185`	`185`	`\|`
`186`	`186`	`= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!`
`187`	`187`	`= note: for more information, see issue #124535 <https://github.com/rust-lang/rust/issues/124535>`