rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

resolve: Tweak some expected/found wording

Browse Source
This commit is contained in:
Vadim Petrochenkov
2019-09-14 22:36:58 +03:00
parent ca3766e2e5
commit f6a5b29d19
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/librustc_resolve/macros.rs
View File

@@ -237,7 +237,8 @@ impl<'a> base::Resolver for Resolver<'a> {
if let Res::Def(..) = res { if let Res::Def(..) = res {
self.session.span_err( self.session.span_err(
span, span,
"expected an inert attribute, found an attribute macro" &format!("expected an inert attribute, found {} {}",
res.article(), res.descr()),
); );
return Ok(InvocationRes::Single(self.dummy_ext(kind))); return Ok(InvocationRes::Single(self.dummy_ext(kind)));
} }
@@ -322,7 +323,7 @@ impl<'a> Resolver<'a> {
self.check_stability_and_deprecation(&ext, path); self.check_stability_and_deprecation(&ext, path);
Ok(if ext.macro_kind() != kind { Ok(if ext.macro_kind() != kind {
let expected = if kind == MacroKind::Attr { "attribute" } else { kind.descr() }; let expected = if kind == MacroKind::Attr { "attribute" } else { kind.descr() };
let msg = format!("expected {}, found {} `{}`", expected, res.descr(), path); let msg = format!("expected {}, found {} `{}`", expected, res.descr(), path);
self.session.struct_span_err(path.span, &msg) self.session.struct_span_err(path.span, &msg)
.span_label(path.span, format!("not {} {}", kind.article(), expected)) .span_label(path.span, format!("not {} {}", kind.article(), expected))

4
src/test/ui/issues/issue-49934-errors.rs
View File

@@ -1,10 +1,10 @@
fn foo<#[derive(Debug)] T>() { fn foo<#[derive(Debug)] T>() {
//~^ ERROR `derive` may only be applied to structs, enums and unions //~^ ERROR `derive` may only be applied to structs, enums and unions
//~| ERROR expected an inert attribute, found an attribute macro //~| ERROR expected an inert attribute, found a derive macro
match 0 { match 0 {
#[derive(Debug)] #[derive(Debug)]
//~^ ERROR `derive` may only be applied to structs, enums and unions //~^ ERROR `derive` may only be applied to structs, enums and unions
//~| ERROR expected an inert attribute, found an attribute macro //~| ERROR expected an inert attribute, found a derive macro
_ => (), _ => (),
} }
} }

4
src/test/ui/issues/issue-49934-errors.stderr
View File

@@ -4,7 +4,7 @@ error: `derive` may only be applied to structs, enums and unions
LL | fn foo<#[derive(Debug)] T>() { LL | fn foo<#[derive(Debug)] T>() {
| ^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^
error: expected an inert attribute, found an attribute macro error: expected an inert attribute, found a derive macro
--> $DIR/issue-49934-errors.rs:1:17 --> $DIR/issue-49934-errors.rs:1:17
| |
LL | fn foo<#[derive(Debug)] T>() { LL | fn foo<#[derive(Debug)] T>() {
@@ -16,7 +16,7 @@ error: `derive` may only be applied to structs, enums and unions
LL | #[derive(Debug)] LL | #[derive(Debug)]
| ^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^
error: expected an inert attribute, found an attribute macro error: expected an inert attribute, found a derive macro
--> $DIR/issue-49934-errors.rs:5:18 --> $DIR/issue-49934-errors.rs:5:18
| |
LL | #[derive(Debug)] LL | #[derive(Debug)]