diff options
| author | Mohit Agarwal <mohit@sdf.org> | 2016-08-29 16:20:08 +0530 |
|---|---|---|
| committer | Mohit Agarwal <mohit@sdf.org> | 2016-08-29 16:20:08 +0530 |
| commit | d6fc2baa11f0fc5223d4e4b9f84e60ca60e64871 (patch) | |
| tree | 329653d0c5209a8decf835b77c2e2dbd6f93a08a /src/librustc_resolve | |
| parent | 86dde9bbda92c02c61282b5df5d38338a798ef3b (diff) | |
| download | rust-d6fc2baa11f0fc5223d4e4b9f84e60ca60e64871.tar.gz rust-d6fc2baa11f0fc5223d4e4b9f84e60ca60e64871.zip | |
Update E0260 to new error format
Updates #35515. Part of #35233. r? @jonathandturner
Diffstat (limited to 'src/librustc_resolve')
| -rw-r--r-- | src/librustc_resolve/lib.rs | 6 |
1 files changed, 5 insertions, 1 deletions
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); |