nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-20 04:24:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Suggest renaming import if names clash

Browse Source
This commit is contained in:
Cldfire 2017-10-31 13:31:48 -04:00
parent 6713736275
commit ff832405d0
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/librustc_resolve/lib.rs
View File

@ -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);
@ -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);
}