1
Fork 0

Don't suggest macros that out of scope

This commit is contained in:
Temirkhan Myrzamadi 2020-08-29 01:01:29 +06:00
parent 479298e05e
commit ea7cf61068
4 changed files with 9 additions and 15 deletions

View file

@ -929,8 +929,15 @@ impl<'a> Resolver<'a> {
); );
self.add_typo_suggestion(err, suggestion, ident.span); self.add_typo_suggestion(err, suggestion, ident.span);
let import_suggestions = let import_suggestions = self.lookup_import_candidates(
self.lookup_import_candidates(ident, Namespace::MacroNS, parent_scope, |_| true); ident,
Namespace::MacroNS,
parent_scope,
|res| match res {
Res::Def(DefKind::Macro(MacroKind::Bang), _) => true,
_ => false,
},
);
show_candidates(err, None, &import_suggestions, false, true); show_candidates(err, None, &import_suggestions, false, true);
if macro_kind == MacroKind::Derive && (ident.name == sym::Send || ident.name == sym::Sync) { if macro_kind == MacroKind::Derive && (ident.name == sym::Send || ident.name == sym::Sync) {

View file

@ -3,9 +3,6 @@ error: cannot find macro `test` in this scope
| |
LL | concat!(test!()); LL | concat!(test!());
| ^^^^ | ^^^^
|
= note: consider importing this attribute macro:
std::prelude::v1::test
error: aborting due to previous error error: aborting due to previous error

View file

@ -16,8 +16,6 @@ error: cannot find attribute `empty_helper` in this scope
LL | #[derive(GenHelperUse)] LL | #[derive(GenHelperUse)]
| ^^^^^^^^^^^^ | ^^^^^^^^^^^^
| |
= note: consider importing this attribute macro:
empty_helper
= note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info) = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
error: cannot find attribute `empty_helper` in this scope error: cannot find attribute `empty_helper` in this scope
@ -29,8 +27,6 @@ LL | #[empty_helper]
LL | gen_helper_use!(); LL | gen_helper_use!();
| ------------------ in this macro invocation | ------------------ in this macro invocation
| |
= note: consider importing this attribute macro:
crate::empty_helper
= note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
error[E0659]: `empty_helper` is ambiguous (name vs any other name during import resolution) error[E0659]: `empty_helper` is ambiguous (name vs any other name during import resolution)

View file

@ -93,18 +93,12 @@ error: cannot find macro `my_macro_attr` in this scope
| |
LL | my_macro_attr!(); LL | my_macro_attr!();
| ^^^^^^^^^^^^^ | ^^^^^^^^^^^^^
|
= note: consider importing this attribute macro:
my_macro_attr
error: cannot find macro `MyTrait` in this scope error: cannot find macro `MyTrait` in this scope
--> $DIR/macro-namespace-reserved-2.rs:33:5 --> $DIR/macro-namespace-reserved-2.rs:33:5
| |
LL | MyTrait!(); LL | MyTrait!();
| ^^^^^^^ | ^^^^^^^
|
= note: consider importing this derive macro:
MyTrait
error: cannot find attribute `my_macro` in this scope error: cannot find attribute `my_macro` in this scope
--> $DIR/macro-namespace-reserved-2.rs:38:3 --> $DIR/macro-namespace-reserved-2.rs:38:3