From d6fc2baa11f0fc5223d4e4b9f84e60ca60e64871 Mon Sep 17 00:00:00 2001
From: Mohit Agarwal <mohit@sdf.org>
Date: Mon, 29 Aug 2016 16:20:08 +0530
Subject: Update E0260 to new error format

Updates #35515.
Part of #35233.

r? @jonathandturner
---
 src/librustc_resolve/lib.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/librustc_resolve')

diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs
index 6a4a48377c7..9d0c93f3e9d 100644
--- a/src/librustc_resolve/lib.rs
+++ b/src/librustc_resolve/lib.rs
@@ -3354,7 +3354,11 @@ impl<'a> Resolver<'a> {
                 e.span_label(span, &"already imported");
                 e
             },
-            (true, _) | (_, true) => struct_span_err!(self.session, span, E0260, "{}", msg),
+            (true, _) | (_, true) => {
+                let mut e = struct_span_err!(self.session, span, E0260, "{}", msg);
+                e.span_label(span, &format!("`{}` already imported", name));
+                e
+            },
             _ => match (old_binding.is_import(), binding.is_import()) {
                 (false, false) => {
                     let mut e = struct_span_err!(self.session, span, E0428, "{}", msg);
-- 
cgit 1.4.1-3-g733a5