Skip to content
Permalink
Browse files

resolve: Remove `!` from "cannot find" diagnostics for macros

  • Loading branch information...
petrochenkov committed Sep 15, 2019
1 parent 42a19dd commit f7f8d6584bf342cdc22eb06888f7cb674b73b3b5
Showing with 42 additions and 43 deletions.
  1. +1 −2 src/librustc_resolve/macros.rs
  2. +1 −1 src/test/ui/empty/empty-macro-use.stderr
  3. +1 −1 src/test/ui/ext-nonexistent.stderr
  4. +1 −1 src/test/ui/hygiene/no_implicit_prelude-2018.rs
  5. +1 −1 src/test/ui/hygiene/no_implicit_prelude-2018.stderr
  6. +1 −1 src/test/ui/hygiene/no_implicit_prelude.rs
  7. +1 −1 src/test/ui/hygiene/no_implicit_prelude.stderr
  8. +1 −1 src/test/ui/issues/issue-11692-1.rs
  9. +1 −1 src/test/ui/issues/issue-11692-1.stderr
  10. +1 −1 src/test/ui/issues/issue-11692-2.rs
  11. +1 −1 src/test/ui/issues/issue-11692-2.stderr
  12. +1 −1 src/test/ui/issues/issue-19734.rs
  13. +1 −1 src/test/ui/issues/issue-19734.stderr
  14. +2 −2 src/test/ui/issues/issue-40845.rs
  15. +2 −2 src/test/ui/issues/issue-40845.stderr
  16. +1 −1 src/test/ui/issues/issue-49074.rs
  17. +1 −1 src/test/ui/issues/issue-49074.stderr
  18. +2 −2 src/test/ui/macros/macro-expansion-tests.stderr
  19. +1 −1 src/test/ui/macros/macro-name-typo.stderr
  20. +1 −1 src/test/ui/macros/macro-path-prelude-fail-3.rs
  21. +1 −1 src/test/ui/macros/macro-path-prelude-fail-3.stderr
  22. +1 −1 src/test/ui/macros/macro-use-wrong-name.stderr
  23. +1 −1 src/test/ui/macros/macro_undefined.stderr
  24. +1 −1 src/test/ui/missing/missing-macro-use.rs
  25. +1 −1 src/test/ui/missing/missing-macro-use.stderr
  26. +2 −2 src/test/ui/proc-macro/macro-namespace-reserved-2.rs
  27. +2 −2 src/test/ui/proc-macro/macro-namespace-reserved-2.stderr
  28. +4 −4 src/test/ui/proc-macro/resolve-error.stderr
  29. +1 −1 src/test/ui/resolve/visibility-indeterminate.rs
  30. +1 −1 src/test/ui/resolve/visibility-indeterminate.stderr
  31. +1 −1 src/test/ui/self/self_type_keyword.rs
  32. +1 −1 src/test/ui/self/self_type_keyword.stderr
  33. +1 −1 src/test/ui/tool-attributes/tool-attributes-misplaced-1.rs
  34. +1 −1 src/test/ui/tool-attributes/tool-attributes-misplaced-1.stderr
@@ -774,9 +774,8 @@ impl<'a> Resolver<'a> {
}
Err(..) => {
assert!(initial_binding.is_none());
let bang = if kind == MacroKind::Bang { "!" } else { "" };
let expected = kind.descr_expected();
let msg = format!("cannot find {} `{}{}` in this scope", expected, ident, bang);
let msg = format!("cannot find {} `{}` in this scope", expected, ident);
let mut err = self.session.struct_span_err(ident.span, &msg);
self.unresolved_macro_suggestions(&mut err, kind, &parent_scope, ident);
err.emit();
@@ -1,4 +1,4 @@
error: cannot find macro `macro_two!` in this scope
error: cannot find macro `macro_two` in this scope
--> $DIR/empty-macro-use.rs:7:5
|
LL | macro_two!();
@@ -1,4 +1,4 @@
error: cannot find macro `iamnotanextensionthatexists!` in this scope
error: cannot find macro `iamnotanextensionthatexists` in this scope
--> $DIR/ext-nonexistent.rs:2:13
|
LL | fn main() { iamnotanextensionthatexists!(""); }
@@ -4,7 +4,7 @@
mod bar {
fn f() {
::std::print!(""); // OK
print!(); //~ ERROR cannot find macro `print!` in this scope
print!(); //~ ERROR cannot find macro `print` in this scope
}
}

@@ -1,4 +1,4 @@
error: cannot find macro `print!` in this scope
error: cannot find macro `print` in this scope
--> $DIR/no_implicit_prelude-2018.rs:7:9
|
LL | print!();
@@ -13,7 +13,7 @@ mod bar {
}
fn f() {
::foo::m!();
assert_eq!(0, 0); //~ ERROR cannot find macro `panic!` in this scope
assert_eq!(0, 0); //~ ERROR cannot find macro `panic` in this scope
}
}

@@ -1,4 +1,4 @@
error: cannot find macro `panic!` in this scope
error: cannot find macro `panic` in this scope
--> $DIR/no_implicit_prelude.rs:16:9
|
LL | assert_eq!(0, 0);
@@ -1,3 +1,3 @@
fn main() {
print!(testo!()); //~ ERROR cannot find macro `testo!` in this scope
print!(testo!()); //~ ERROR cannot find macro `testo` in this scope
}
@@ -1,4 +1,4 @@
error: cannot find macro `testo!` in this scope
error: cannot find macro `testo` in this scope
--> $DIR/issue-11692-1.rs:2:12
|
LL | print!(testo!());
@@ -1,3 +1,3 @@
fn main() {
concat!(test!()); //~ ERROR cannot find macro `test!` in this scope
concat!(test!()); //~ ERROR cannot find macro `test` in this scope
}
@@ -1,4 +1,4 @@
error: cannot find macro `test!` in this scope
error: cannot find macro `test` in this scope
--> $DIR/issue-11692-2.rs:2:13
|
LL | concat!(test!());
@@ -4,5 +4,5 @@ struct Type;

impl Type {
undef!();
//~^ ERROR cannot find macro `undef!` in this scope
//~^ ERROR cannot find macro `undef` in this scope
}
@@ -1,4 +1,4 @@
error: cannot find macro `undef!` in this scope
error: cannot find macro `undef` in this scope
--> $DIR/issue-19734.rs:6:5
|
LL | undef!();
@@ -1,6 +1,6 @@
trait T { m!(); } //~ ERROR cannot find macro `m!` in this scope
trait T { m!(); } //~ ERROR cannot find macro `m` in this scope

struct S;
impl S { m!(); } //~ ERROR cannot find macro `m!` in this scope
impl S { m!(); } //~ ERROR cannot find macro `m` in this scope

fn main() {}
@@ -1,10 +1,10 @@
error: cannot find macro `m!` in this scope
error: cannot find macro `m` in this scope
--> $DIR/issue-40845.rs:4:10
|
LL | impl S { m!(); }
| ^

error: cannot find macro `m!` in this scope
error: cannot find macro `m` in this scope
--> $DIR/issue-40845.rs:1:11
|
LL | trait T { m!(); }
@@ -9,5 +9,5 @@ mod foo {
}

fn main() {
bar!(); //~ ERROR cannot find macro `bar!` in this scope
bar!(); //~ ERROR cannot find macro `bar` in this scope
}
@@ -1,4 +1,4 @@
error: cannot find macro `bar!` in this scope
error: cannot find macro `bar` in this scope
--> $DIR/issue-49074.rs:12:4
|
LL | bar!();
@@ -1,12 +1,12 @@
error: cannot find macro `m!` in this scope
error: cannot find macro `m` in this scope
--> $DIR/macro-expansion-tests.rs:7:21
|
LL | fn g() -> i32 { m!() }
| ^
|
= help: have you added the `#[macro_use]` on the module/import?

error: cannot find macro `m!` in this scope
error: cannot find macro `m` in this scope
--> $DIR/macro-expansion-tests.rs:15:21
|
LL | fn g() -> i32 { m!() }
@@ -1,4 +1,4 @@
error: cannot find macro `printlx!` in this scope
error: cannot find macro `printlx` in this scope
--> $DIR/macro-name-typo.rs:2:5
|
LL | printlx!("oh noes!");
@@ -1,3 +1,3 @@
fn main() {
inline!(); //~ ERROR cannot find macro `inline!` in this scope
inline!(); //~ ERROR cannot find macro `inline` in this scope
}
@@ -1,4 +1,4 @@
error: cannot find macro `inline!` in this scope
error: cannot find macro `inline` in this scope
--> $DIR/macro-path-prelude-fail-3.rs:2:5
|
LL | inline!();
@@ -1,4 +1,4 @@
error: cannot find macro `macro_two!` in this scope
error: cannot find macro `macro_two` in this scope
--> $DIR/macro-use-wrong-name.rs:7:5
|
LL | macro_two!();
@@ -1,4 +1,4 @@
error: cannot find macro `k!` in this scope
error: cannot find macro `k` in this scope
--> $DIR/macro_undefined.rs:11:5
|
LL | k!();
@@ -4,5 +4,5 @@ extern crate two_macros;

pub fn main() {
macro_two!();
//~^ ERROR cannot find macro `macro_two!` in this scope
//~^ ERROR cannot find macro `macro_two` in this scope
}
@@ -1,4 +1,4 @@
error: cannot find macro `macro_two!` in this scope
error: cannot find macro `macro_two` in this scope
--> $DIR/missing-macro-use.rs:6:5
|
LL | macro_two!();
@@ -25,12 +25,12 @@ fn check_bang1() {
my_macro!(); //~ ERROR can't use a procedural macro from the same crate that defines it
}
fn check_bang2() {
my_macro_attr!(); //~ ERROR cannot find macro `my_macro_attr!` in this scope
my_macro_attr!(); //~ ERROR cannot find macro `my_macro_attr` in this scope
crate::my_macro_attr!(); //~ ERROR can't use a procedural macro from the same crate that defines
//~| ERROR expected macro, found attribute macro `crate::my_macro_attr`
}
fn check_bang3() {
MyTrait!(); //~ ERROR cannot find macro `MyTrait!` in this scope
MyTrait!(); //~ ERROR cannot find macro `MyTrait` in this scope
crate::MyTrait!(); //~ ERROR can't use a procedural macro from the same crate that defines it
//~| ERROR expected macro, found derive macro `crate::MyTrait`
}
@@ -88,13 +88,13 @@ error: expected derive macro, found macro `crate::my_macro`
LL | #[derive(crate::my_macro)]
| ^^^^^^^^^^^^^^^ not a derive macro

error: cannot find macro `my_macro_attr!` in this scope
error: cannot find macro `my_macro_attr` in this scope
--> $DIR/macro-namespace-reserved-2.rs:28:5
|
LL | 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
|
LL | MyTrait!();
@@ -1,22 +1,22 @@
error: cannot find macro `bang_proc_macrp!` in this scope
error: cannot find macro `bang_proc_macrp` in this scope
--> $DIR/resolve-error.rs:56:5
|
LL | bang_proc_macrp!();
| ^^^^^^^^^^^^^^^ help: a macro with a similar name exists: `bang_proc_macro`

error: cannot find macro `Dlona!` in this scope
error: cannot find macro `Dlona` in this scope
--> $DIR/resolve-error.rs:53:5
|
LL | Dlona!();
| ^^^^^

error: cannot find macro `attr_proc_macra!` in this scope
error: cannot find macro `attr_proc_macra` in this scope
--> $DIR/resolve-error.rs:50:5
|
LL | attr_proc_macra!();
| ^^^^^^^^^^^^^^^ help: a macro with a similar name exists: `attr_proc_mac`

error: cannot find macro `FooWithLongNama!` in this scope
error: cannot find macro `FooWithLongNama` in this scope
--> $DIR/resolve-error.rs:47:5
|
LL | FooWithLongNama!();
@@ -1,6 +1,6 @@
// edition:2018

foo!(); //~ ERROR cannot find macro `foo!` in this scope
foo!(); //~ ERROR cannot find macro `foo` in this scope

pub(in ::bar) struct Baz {} //~ ERROR cannot determine resolution for the visibility

@@ -4,7 +4,7 @@ error[E0578]: cannot determine resolution for the visibility
LL | pub(in ::bar) struct Baz {}
| ^^^^^

error: cannot find macro `foo!` in this scope
error: cannot find macro `foo` in this scope
--> $DIR/visibility-indeterminate.rs:3:1
|
LL | foo!();
@@ -19,7 +19,7 @@ pub fn main() {
ref mut Self => (),
//~^ ERROR expected identifier, found keyword `Self`
Self!() => (),
//~^ ERROR cannot find macro `Self!` in this scope
//~^ ERROR cannot find macro `Self` in this scope
Foo { Self } => (),
//~^ ERROR expected identifier, found keyword `Self`
}
@@ -54,7 +54,7 @@ error: lifetimes cannot use keyword names
LL | struct Bar<'Self>;
| ^^^^^

error: cannot find macro `Self!` in this scope
error: cannot find macro `Self` in this scope
--> $DIR/self_type_keyword.rs:21:9
|
LL | Self!() => (),
@@ -11,7 +11,7 @@ fn check() {}
#[rustfmt::skip] // OK
fn main() {
rustfmt; //~ ERROR expected value, found tool module `rustfmt`
rustfmt!(); //~ ERROR cannot find macro `rustfmt!` in this scope
rustfmt!(); //~ ERROR cannot find macro `rustfmt` in this scope

rustfmt::skip; //~ ERROR expected value, found tool attribute `rustfmt::skip`
}
@@ -10,7 +10,7 @@ error: cannot find attribute `rustfmt` in this scope
LL | #[rustfmt]
| ^^^^^^^

error: cannot find macro `rustfmt!` in this scope
error: cannot find macro `rustfmt` in this scope
--> $DIR/tool-attributes-misplaced-1.rs:14:5
|
LL | rustfmt!();

0 comments on commit f7f8d65

Please sign in to comment.
You can’t perform that action at this time.