Skip to content

Commit 6b54a3f

Browse files
committed
Reword message
1 parent fe7ed27 commit 6b54a3f

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

compiler/rustc_lint/messages.ftl

+2-2
Original file line numberDiff line numberDiff line change
@@ -630,8 +630,8 @@ lint_opaque_hidden_inferred_bound_sugg = add this bound
630630
lint_or_patterns_back_compat = the meaning of the `pat` fragment specifier is changing in Rust 2021, which may affect this macro
631631
.suggestion = use pat_param to preserve semantics
632632
633-
lint_out_of_scope_macro_calls = cannot find macro `{$path}` in {$scope}
634-
.label = not found in {$scope}
633+
lint_out_of_scope_macro_calls = cannot find macro `{$path}` in the current scope from {$scope}
634+
.label = not found from {$scope}
635635
.help = import `macro_rules` with `use` to make it callable above its definition
636636
637637
lint_overflowing_bin_hex = literal out of range for `{$ty}`

tests/ui/attributes/key-value-expansion-scope.stderr

+12-12
Original file line numberDiff line numberDiff line change
@@ -126,62 +126,62 @@ LL | #![doc = in_block!()]
126126
|
127127
= help: have you added the `#[macro_use]` on the module/import?
128128

129-
warning: cannot find macro `in_root` in the crate root
129+
warning: cannot find macro `in_root` in the current scope from the crate root
130130
--> $DIR/key-value-expansion-scope.rs:1:10
131131
|
132132
LL | #![doc = in_root!()]
133-
| ^^^^^^^ not found in the crate root
133+
| ^^^^^^^ not found from the crate root
134134
|
135135
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
136136
= note: for more information, see issue #124535 <https://github.com/rust-lang/rust/issues/124535>
137137
= help: import `macro_rules` with `use` to make it callable above its definition
138138
= note: `#[warn(out_of_scope_macro_calls)]` on by default
139139

140-
warning: cannot find macro `in_mod_escape` in the crate root
140+
warning: cannot find macro `in_mod_escape` in the current scope from the crate root
141141
--> $DIR/key-value-expansion-scope.rs:4:10
142142
|
143143
LL | #![doc = in_mod_escape!()]
144-
| ^^^^^^^^^^^^^ not found in the crate root
144+
| ^^^^^^^^^^^^^ not found from the crate root
145145
|
146146
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
147147
= note: for more information, see issue #124535 <https://github.com/rust-lang/rust/issues/124535>
148148
= help: import `macro_rules` with `use` to make it callable above its definition
149149

150-
warning: cannot find macro `in_mod` in module `macros_stay`
150+
warning: cannot find macro `in_mod` in the current scope from module `macros_stay`
151151
--> $DIR/key-value-expansion-scope.rs:21:9
152152
|
153153
LL | #[doc = in_mod!()]
154-
| ^^^^^^ not found in module `macros_stay`
154+
| ^^^^^^ not found from module `macros_stay`
155155
|
156156
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
157157
= note: for more information, see issue #124535 <https://github.com/rust-lang/rust/issues/124535>
158158
= help: import `macro_rules` with `use` to make it callable above its definition
159159

160-
warning: cannot find macro `in_mod` in module `macros_stay`
160+
warning: cannot find macro `in_mod` in the current scope from module `macros_stay`
161161
--> $DIR/key-value-expansion-scope.rs:24:14
162162
|
163163
LL | #![doc = in_mod!()]
164-
| ^^^^^^ not found in module `macros_stay`
164+
| ^^^^^^ not found from module `macros_stay`
165165
|
166166
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
167167
= note: for more information, see issue #124535 <https://github.com/rust-lang/rust/issues/124535>
168168
= help: import `macro_rules` with `use` to make it callable above its definition
169169

170-
warning: cannot find macro `in_mod_escape` in module `macros_escape`
170+
warning: cannot find macro `in_mod_escape` in the current scope from module `macros_escape`
171171
--> $DIR/key-value-expansion-scope.rs:36:9
172172
|
173173
LL | #[doc = in_mod_escape!()]
174-
| ^^^^^^^^^^^^^ not found in module `macros_escape`
174+
| ^^^^^^^^^^^^^ not found from module `macros_escape`
175175
|
176176
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
177177
= note: for more information, see issue #124535 <https://github.com/rust-lang/rust/issues/124535>
178178
= help: import `macro_rules` with `use` to make it callable above its definition
179179

180-
warning: cannot find macro `in_mod_escape` in module `macros_escape`
180+
warning: cannot find macro `in_mod_escape` in the current scope from module `macros_escape`
181181
--> $DIR/key-value-expansion-scope.rs:39:14
182182
|
183183
LL | #![doc = in_mod_escape!()]
184-
| ^^^^^^^^^^^^^ not found in module `macros_escape`
184+
| ^^^^^^^^^^^^^ not found from module `macros_escape`
185185
|
186186
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
187187
= note: for more information, see issue #124535 <https://github.com/rust-lang/rust/issues/124535>

0 commit comments

Comments
 (0)