reword labels

Author: estebank

compiler/rustc_parse/src/parser/diagnostics.rs

@@ -2199,12 +2199,12 @@ impl<'a> Parser<'a> {
                         node.def_span(),
                         format!("this macro fragment matcher is {descr}"),
                     );
-                    err.span_label(next.use_span(), format!("this is interpreted as {next_descr}"));
+                    err.span_label(next.use_span(), format!("this is expected to be {next_descr}"));
                     err.span_label(
                         node.use_span(),
                         format!(
-                            "this is interpreted as {}, but it was previously interpreted as {}",
-                            descr, next_descr,
+                            "this is interpreted as {}, but it is expected to be {}",
+                            next_descr, descr,
                         ),
                     );
                     show_link = true;

tests/ui/macros/trace_faulty_macros.stderr

@@ -73,7 +73,7 @@ error: expected expression, found pattern `1 + 1`
   --> $DIR/trace_faulty_macros.rs:49:37
    |
 LL |     (let $p:pat = $e:expr) => {test!(($p,$e))};
-   |                   -------                -- this is interpreted as pattern, but it was previously interpreted as expression
+   |                   -------                -- this is interpreted as expression, but it is expected to be pattern
    |                   |
    |                   this macro fragment matcher is expression
 ...
@@ -85,7 +85,7 @@ LL |     (($p:pat, $e:pat)) => {let $p = $e;};
 LL |     test!(let x = 1+1);
    |     ------------------
    |     |             |
-   |     |             this is interpreted as expression
+   |     |             this is expected to be expression
    |     in this macro invocation
    |
    = note: when forwarding a matched fragment to another macro-by-example, matchers in the second macro will see an opaque AST of the fragment type, not the underlying tokens