diff options
| author | Mikhail Modin <mikhailm1@gmail.com> | 2016-08-05 18:57:37 +0300 |
|---|---|---|
| committer | Mikhail Modin <mikhailm1@gmail.com> | 2016-08-05 18:57:37 +0300 |
| commit | 2f5294e1d6ec900f1d650879954016146e5df748 (patch) | |
| tree | 8070129e9eead513ac6bcec433ff7c89cf9fd0bc | |
| parent | 40f3ee2a01ef24d57430726c098de905c7c6e04a (diff) | |
| download | rust-2f5294e1d6ec900f1d650879954016146e5df748.tar.gz rust-2f5294e1d6ec900f1d650879954016146e5df748.zip | |
Fixes #35304
| -rw-r--r-- | src/librustc_typeck/collect.rs | 7 | ||||
| -rw-r--r-- | src/test/compile-fail/impl-duplicate-methods.rs | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/librustc_typeck/collect.rs b/src/librustc_typeck/collect.rs index ec95afe15bd..6429faf35ff 100644 --- a/src/librustc_typeck/collect.rs +++ b/src/librustc_typeck/collect.rs @@ -772,9 +772,10 @@ fn convert_item(ccx: &CrateCtxt, it: &hir::Item) { let mut err = struct_span_err!(tcx.sess, impl_item.span, E0201, "duplicate definitions with name `{}`:", impl_item.name); - span_note!(&mut err, *entry.get(), - "previous definition of `{}` here", - impl_item.name); + err.span_label(*entry.get(), + &format!("previous definition of `{}` here", + impl_item.name)); + err.span_label(impl_item.span, &format!("duplicate definition")); err.emit(); } Vacant(entry) => { diff --git a/src/test/compile-fail/impl-duplicate-methods.rs b/src/test/compile-fail/impl-duplicate-methods.rs index 981eddc9dd9..f6e9ab2d614 100644 --- a/src/test/compile-fail/impl-duplicate-methods.rs +++ b/src/test/compile-fail/impl-duplicate-methods.rs @@ -12,7 +12,9 @@ struct Foo; impl Foo { fn orange(&self) {} //~ NOTE previous definition of `orange` here - fn orange(&self) {} //~ ERROR duplicate definitions with name `orange` + fn orange(&self) {} + //~^ ERROR duplicate definition + //~| NOTE duplicate definition } fn main() {} |