Skip to content

Commit

Permalink
Suggest renaming import if names clash
Browse files Browse the repository at this point in the history
  • Loading branch information
Cldfire committed Oct 31, 2017
1 parent 6713736 commit ff83240
Showing 1 changed file with 23 additions and 3 deletions.
26 changes: 23 additions & 3 deletions src/librustc_resolve/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3606,12 +3606,12 @@ impl<'a> Resolver<'a> {
}
}

fn report_conflict(&mut self,
fn report_conflict<'b>(&mut self,
parent: Module,
ident: Ident,
ns: Namespace,
new_binding: &NameBinding,
old_binding: &NameBinding) {
new_binding: &NameBinding<'b>,
old_binding: &NameBinding<'b>) {
// Error on the second of two conflicting names
if old_binding.span.lo() > new_binding.span.lo() {
return self.report_conflict(parent, ident, ns, old_binding, new_binding);
Expand Down Expand Up @@ -3683,6 +3683,26 @@ impl<'a> Resolver<'a> {
old_noun, old_kind, name));
}

// See https://github.com/rust-lang/rust/issues/32354
if old_binding.is_import() || new_binding.is_import() {
let binding = if new_binding.is_import() {
new_binding
} else {
old_binding
};

let cm = self.session.codemap();
let rename_msg = "You can use `as` to change the binding name of the import";

if let Ok(snippet) = cm.span_to_snippet(binding.span) {
err.span_suggestion(binding.span,
rename_msg,
format!("{} as Other{}", snippet, name));
} else {
err.span_label(binding.span, rename_msg);
}
}

err.emit();
self.name_already_seen.insert(name, span);
}
Expand Down

0 comments on commit ff83240

Please sign in to comment.