From 2f5294e1d6ec900f1d650879954016146e5df748 Mon Sep 17 00:00:00 2001
From: Mikhail Modin <mikhailm1@gmail.com>
Date: Fri, 5 Aug 2016 18:57:37 +0300
Subject: [PATCH] Fixes #35304
---
src/librustc_typeck/collect.rs | 7 ++++---
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 ec95afe15bd51..6429faf35ff80 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 981eddc9dd96b..f6e9ab2d614bc 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() {}