Rollup merge of #64463 - petrochenkov:expectattr, r=Centril

resolve: Tweak some expected/found wording

Author: Centril

src/librustc_resolve/macros.rs

@@ -237,7 +237,8 @@ impl<'a> base::Resolver for Resolver<'a> {
  if let Res::Def(..) = res {
  self.session.span_err(
  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)));
  }
@@ -322,7 +323,7 @@ impl<'a> Resolver<'a> {
  self.check_stability_and_deprecation(&ext, path);
 
  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);
  self.session.struct_span_err(path.span, &msg)
  .span_label(path.span, format!("not {} {}", kind.article(), expected))

src/test/ui/issues/issue-49934-errors.rs

@@ -1,10 +1,10 @@
 fn foo<#[derive(Debug)] T>() {
 //~^ 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 {
  #[derive(Debug)]
  //~^ 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
  _ => (),
  }
 }

src/test/ui/issues/issue-49934-errors.stderr

@@ -4,7 +4,7 @@ error: `derive` may only be applied to structs, enums and unions
 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
  |
 LL | fn foo<#[derive(Debug)] T>() {
@@ -16,7 +16,7 @@ error: `derive` may only be applied to structs, enums and unions
 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
  |
 LL | #[derive(Debug)]