Skip to content
Permalink
Browse files

Tweak duplicate matcher binding error

  • Loading branch information
estebank committed Nov 25, 2019
1 parent 1eeed17 commit 3893d16341b966df1e1a0acf80cfd00d6159057f
Showing with 14 additions and 29 deletions.
  1. +2 −1 src/libsyntax_expand/mbe/macro_check.rs
  2. +12 −28 src/test/ui/macros/macro-multiple-matcher-bindings.stderr
@@ -269,7 +269,8 @@ fn check_binders(
// for nested macro definitions.
sess.span_diagnostic
.struct_span_err(span, "duplicate matcher binding")
.span_note(prev_info.span, "previous declaration was here")
.span_label(span, "duplicate binding")
.span_label(prev_info.span, "previous binding")
.emit();
*valid = false;
} else {
@@ -2,49 +2,33 @@ error: duplicate matcher binding
--> $DIR/macro-multiple-matcher-bindings.rs:7:16
|
LL | ($a:ident, $a:ident) => {};
| ^^^^^^^^
|
note: previous declaration was here
--> $DIR/macro-multiple-matcher-bindings.rs:7:6
|
LL | ($a:ident, $a:ident) => {};
| ^^^^^^^^
| -------- ^^^^^^^^ duplicate binding
| |
| previous binding

error: duplicate matcher binding
--> $DIR/macro-multiple-matcher-bindings.rs:8:16
|
LL | ($a:ident, $a:path) => {};
| ^^^^^^^
|
note: previous declaration was here
--> $DIR/macro-multiple-matcher-bindings.rs:8:6
|
LL | ($a:ident, $a:path) => {};
| ^^^^^^^^
| -------- ^^^^^^^ duplicate binding
| |
| previous binding

error: duplicate matcher binding
--> $DIR/macro-multiple-matcher-bindings.rs:17:18
|
LL | ($a:ident, $($a:ident),*) => {};
| ^^^^^^^^
|
note: previous declaration was here
--> $DIR/macro-multiple-matcher-bindings.rs:17:6
|
LL | ($a:ident, $($a:ident),*) => {};
| ^^^^^^^^
| -------- ^^^^^^^^ duplicate binding
| |
| previous binding

error: duplicate matcher binding
--> $DIR/macro-multiple-matcher-bindings.rs:18:25
|
LL | ($($a:ident)+ # $($($a:path),+);*) => {};
| ^^^^^^^
|
note: previous declaration was here
--> $DIR/macro-multiple-matcher-bindings.rs:18:8
|
LL | ($($a:ident)+ # $($($a:path),+);*) => {};
| ^^^^^^^^
| -------- ^^^^^^^ duplicate binding
| |
| previous binding

error: aborting due to 4 previous errors

0 comments on commit 3893d16

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