diff options
Diffstat (limited to 'src')
34 files changed, 42 insertions, 43 deletions
diff --git a/src/librustc_resolve/macros.rs b/src/librustc_resolve/macros.rs index 734ae8d94d8..3900a3dbb38 100644 --- a/src/librustc_resolve/macros.rs +++ b/src/librustc_resolve/macros.rs @@ -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(); diff --git a/src/test/ui/empty/empty-macro-use.stderr b/src/test/ui/empty/empty-macro-use.stderr index 16300411c8c..8e3e06896ee 100644 --- a/src/test/ui/empty/empty-macro-use.stderr +++ b/src/test/ui/empty/empty-macro-use.stderr @@ -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!(); diff --git a/src/test/ui/ext-nonexistent.stderr b/src/test/ui/ext-nonexistent.stderr index 3fbbb495264..f3aa83fd508 100644 --- a/src/test/ui/ext-nonexistent.stderr +++ b/src/test/ui/ext-nonexistent.stderr @@ -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!(""); } diff --git a/src/test/ui/hygiene/no_implicit_prelude-2018.rs b/src/test/ui/hygiene/no_implicit_prelude-2018.rs index 3ad7435fecf..83ca28167a4 100644 --- a/src/test/ui/hygiene/no_implicit_prelude-2018.rs +++ b/src/test/ui/hygiene/no_implicit_prelude-2018.rs @@ -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 } } diff --git a/src/test/ui/hygiene/no_implicit_prelude-2018.stderr b/src/test/ui/hygiene/no_implicit_prelude-2018.stderr index 0fdb18d967a..f31b75238df 100644 --- a/src/test/ui/hygiene/no_implicit_prelude-2018.stderr +++ b/src/test/ui/hygiene/no_implicit_prelude-2018.stderr @@ -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!(); diff --git a/src/test/ui/hygiene/no_implicit_prelude.rs b/src/test/ui/hygiene/no_implicit_prelude.rs index 890c8307543..204e7b24879 100644 --- a/src/test/ui/hygiene/no_implicit_prelude.rs +++ b/src/test/ui/hygiene/no_implicit_prelude.rs @@ -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 } } diff --git a/src/test/ui/hygiene/no_implicit_prelude.stderr b/src/test/ui/hygiene/no_implicit_prelude.stderr index 8fa55d05bdd..bc0ce746be9 100644 --- a/src/test/ui/hygiene/no_implicit_prelude.stderr +++ b/src/test/ui/hygiene/no_implicit_prelude.stderr @@ -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); diff --git a/src/test/ui/issues/issue-11692-1.rs b/src/test/ui/issues/issue-11692-1.rs index 70b712c5608..b6f3bb8ef05 100644 --- a/src/test/ui/issues/issue-11692-1.rs +++ b/src/test/ui/issues/issue-11692-1.rs @@ -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 } diff --git a/src/test/ui/issues/issue-11692-1.stderr b/src/test/ui/issues/issue-11692-1.stderr index bfd1647e8be..386463436b8 100644 --- a/src/test/ui/issues/issue-11692-1.stderr +++ b/src/test/ui/issues/issue-11692-1.stderr @@ -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!()); diff --git a/src/test/ui/issues/issue-11692-2.rs b/src/test/ui/issues/issue-11692-2.rs index 61be284d732..5957ed338f4 100644 --- a/src/test/ui/issues/issue-11692-2.rs +++ b/src/test/ui/issues/issue-11692-2.rs @@ -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 } diff --git a/src/test/ui/issues/issue-11692-2.stderr b/src/test/ui/issues/issue-11692-2.stderr index 740c3555e52..f021943da32 100644 --- a/src/test/ui/issues/issue-11692-2.stderr +++ b/src/test/ui/issues/issue-11692-2.stderr @@ -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!()); diff --git a/src/test/ui/issues/issue-19734.rs b/src/test/ui/issues/issue-19734.rs index b730e19a1e6..fe4a327aef4 100644 --- a/src/test/ui/issues/issue-19734.rs +++ b/src/test/ui/issues/issue-19734.rs @@ -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 } diff --git a/src/test/ui/issues/issue-19734.stderr b/src/test/ui/issues/issue-19734.stderr index fc1a7d0381b..81757974de9 100644 --- a/src/test/ui/issues/issue-19734.stderr +++ b/src/test/ui/issues/issue-19734.stderr @@ -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!(); diff --git a/src/test/ui/issues/issue-40845.rs b/src/test/ui/issues/issue-40845.rs index c9102f4417c..a4ede6adfa3 100644 --- a/src/test/ui/issues/issue-40845.rs +++ b/src/test/ui/issues/issue-40845.rs @@ -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() {} diff --git a/src/test/ui/issues/issue-40845.stderr b/src/test/ui/issues/issue-40845.stderr index a8be38ebf06..2744330a4e5 100644 --- a/src/test/ui/issues/issue-40845.stderr +++ b/src/test/ui/issues/issue-40845.stderr @@ -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!(); } diff --git a/src/test/ui/issues/issue-49074.rs b/src/test/ui/issues/issue-49074.rs index f909add5f58..752bb345b70 100644 --- a/src/test/ui/issues/issue-49074.rs +++ b/src/test/ui/issues/issue-49074.rs @@ -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 } diff --git a/src/test/ui/issues/issue-49074.stderr b/src/test/ui/issues/issue-49074.stderr index 42d0b511fc5..bbfeb4ea948 100644 --- a/src/test/ui/issues/issue-49074.stderr +++ b/src/test/ui/issues/issue-49074.stderr @@ -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!(); diff --git a/src/test/ui/macros/macro-expansion-tests.stderr b/src/test/ui/macros/macro-expansion-tests.stderr index 4ad9ade95a0..8b3f7ca8817 100644 --- a/src/test/ui/macros/macro-expansion-tests.stderr +++ b/src/test/ui/macros/macro-expansion-tests.stderr @@ -1,4 +1,4 @@ -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!() } @@ -6,7 +6,7 @@ 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!() } diff --git a/src/test/ui/macros/macro-name-typo.stderr b/src/test/ui/macros/macro-name-typo.stderr index 967f4f3c4ac..ce2e1985b38 100644 --- a/src/test/ui/macros/macro-name-typo.stderr +++ b/src/test/ui/macros/macro-name-typo.stderr @@ -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!"); diff --git a/src/test/ui/macros/macro-path-prelude-fail-3.rs b/src/test/ui/macros/macro-path-prelude-fail-3.rs index 597053d6251..68eb350a956 100644 --- a/src/test/ui/macros/macro-path-prelude-fail-3.rs +++ b/src/test/ui/macros/macro-path-prelude-fail-3.rs @@ -1,3 +1,3 @@ fn main() { - inline!(); //~ ERROR cannot find macro `inline!` in this scope + inline!(); //~ ERROR cannot find macro `inline` in this scope } diff --git a/src/test/ui/macros/macro-path-prelude-fail-3.stderr b/src/test/ui/macros/macro-path-prelude-fail-3.stderr index 96b8a24cff2..ec00760de6c 100644 --- a/src/test/ui/macros/macro-path-prelude-fail-3.stderr +++ b/src/test/ui/macros/macro-path-prelude-fail-3.stderr @@ -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!(); diff --git a/src/test/ui/macros/macro-use-wrong-name.stderr b/src/test/ui/macros/macro-use-wrong-name.stderr index 28f727d6a58..8b4e90a5798 100644 --- a/src/test/ui/macros/macro-use-wrong-name.stderr +++ b/src/test/ui/macros/macro-use-wrong-name.stderr @@ -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!(); diff --git a/src/test/ui/macros/macro_undefined.stderr b/src/test/ui/macros/macro_undefined.stderr index 9239b2a51e6..01c8ebea62a 100644 --- a/src/test/ui/macros/macro_undefined.stderr +++ b/src/test/ui/macros/macro_undefined.stderr @@ -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!(); diff --git a/src/test/ui/missing/missing-macro-use.rs b/src/test/ui/missing/missing-macro-use.rs index dff4c94fcf4..d494c4471a3 100644 --- a/src/test/ui/missing/missing-macro-use.rs +++ b/src/test/ui/missing/missing-macro-use.rs @@ -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 } diff --git a/src/test/ui/missing/missing-macro-use.stderr b/src/test/ui/missing/missing-macro-use.stderr index 01a7beb3b05..711e249d2bc 100644 --- a/src/test/ui/missing/missing-macro-use.stderr +++ b/src/test/ui/missing/missing-macro-use.stderr @@ -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!(); diff --git a/src/test/ui/proc-macro/macro-namespace-reserved-2.rs b/src/test/ui/proc-macro/macro-namespace-reserved-2.rs index bc46a07dd3f..b17c0565932 100644 --- a/src/test/ui/proc-macro/macro-namespace-reserved-2.rs +++ b/src/test/ui/proc-macro/macro-namespace-reserved-2.rs @@ -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` } diff --git a/src/test/ui/proc-macro/macro-namespace-reserved-2.stderr b/src/test/ui/proc-macro/macro-namespace-reserved-2.stderr index 9616e80fa64..c011a70cd0c 100644 --- a/src/test/ui/proc-macro/macro-namespace-reserved-2.stderr +++ b/src/test/ui/proc-macro/macro-namespace-reserved-2.stderr @@ -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!(); diff --git a/src/test/ui/proc-macro/resolve-error.stderr b/src/test/ui/proc-macro/resolve-error.stderr index 6c242cf45d6..3dca5cee63c 100644 --- a/src/test/ui/proc-macro/resolve-error.stderr +++ b/src/test/ui/proc-macro/resolve-error.stderr @@ -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!(); diff --git a/src/test/ui/resolve/visibility-indeterminate.rs b/src/test/ui/resolve/visibility-indeterminate.rs index 198ea752881..0e1142db37d 100644 --- a/src/test/ui/resolve/visibility-indeterminate.rs +++ b/src/test/ui/resolve/visibility-indeterminate.rs @@ -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 diff --git a/src/test/ui/resolve/visibility-indeterminate.stderr b/src/test/ui/resolve/visibility-indeterminate.stderr index 17927a5967d..b9678291ee4 100644 --- a/src/test/ui/resolve/visibility-indeterminate.stderr +++ b/src/test/ui/resolve/visibility-indeterminate.stderr @@ -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!(); diff --git a/src/test/ui/self/self_type_keyword.rs b/src/test/ui/self/self_type_keyword.rs index 844f13c2f89..dfb7d6583d9 100644 --- a/src/test/ui/self/self_type_keyword.rs +++ b/src/test/ui/self/self_type_keyword.rs @@ -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` } diff --git a/src/test/ui/self/self_type_keyword.stderr b/src/test/ui/self/self_type_keyword.stderr index bb631194bf3..11b3b012c5f 100644 --- a/src/test/ui/self/self_type_keyword.stderr +++ b/src/test/ui/self/self_type_keyword.stderr @@ -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!() => (), diff --git a/src/test/ui/tool-attributes/tool-attributes-misplaced-1.rs b/src/test/ui/tool-attributes/tool-attributes-misplaced-1.rs index 72929c5e805..d5698be8d4c 100644 --- a/src/test/ui/tool-attributes/tool-attributes-misplaced-1.rs +++ b/src/test/ui/tool-attributes/tool-attributes-misplaced-1.rs @@ -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` } diff --git a/src/test/ui/tool-attributes/tool-attributes-misplaced-1.stderr b/src/test/ui/tool-attributes/tool-attributes-misplaced-1.stderr index 393ad0949cc..6bef793e0e7 100644 --- a/src/test/ui/tool-attributes/tool-attributes-misplaced-1.stderr +++ b/src/test/ui/tool-attributes/tool-attributes-misplaced-1.stderr @@ -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!(); |