bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Clean up resolver.record_use().

Browse source
This commit is contained in:
Jeffrey Seyfried 2016-07-29 16:04:45 +00:00
parent b107a4e4f6
commit 07c706b57c
1 changed files with 11 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/librustc_resolve/lib.rs
View file

@ -1207,29 +1207,22 @@ impl<'a> Resolver<'a> {
match ns { ValueNS => &mut self.value_ribs, TypeNS => &mut self.type_ribs } match ns { ValueNS => &mut self.value_ribs, TypeNS => &mut self.type_ribs }
} }
#[inline] fn record_use(&mut self, name: Name, ns: Namespace, binding: &'a NameBinding<'a>) {
fn record_use(&mut self, name: Name, binding: &'a NameBinding<'a>) {
// track extern crates for unused_extern_crate lint // track extern crates for unused_extern_crate lint
if let Some(DefId { krate, .. }) = binding.module().and_then(ModuleS::def_id) { if let Some(DefId { krate, .. }) = binding.module().and_then(ModuleS::def_id) {
self.used_crates.insert(krate); self.used_crates.insert(krate);
} }
let directive = match binding.kind { if let NameBindingKind::Import { directive, .. } = binding.kind {
NameBindingKind::Import { directive, .. } => directive, self.used_imports.insert((directive.id, ns));
_ => return, self.add_to_glob_map(directive.id, name);
};
if !self.make_glob_map {
return;
}
if self.glob_map.contains_key(&directive.id) {
self.glob_map.get_mut(&directive.id).unwrap().insert(name);
return;
} }
}
let mut new_set = FnvHashSet(); fn add_to_glob_map(&mut self, id: NodeId, name: Name) {
new_set.insert(name); if self.make_glob_map {
self.glob_map.insert(directive.id, new_set); self.glob_map.entry(id).or_insert_with(FnvHashSet).insert(name);
}
} }
/// Resolves the given module path from the given root `module_`. /// Resolves the given module path from the given root `module_`.
@ -1529,10 +1522,7 @@ impl<'a> Resolver<'a> {
self.populate_module_if_necessary(module); self.populate_module_if_necessary(module);
module.resolve_name(name, namespace, use_lexical_scope).and_then(|binding| { module.resolve_name(name, namespace, use_lexical_scope).and_then(|binding| {
if record_used { if record_used {
if let NameBindingKind::Import { directive, .. } = binding.kind { self.record_use(name, namespace, binding);
self.used_imports.insert((directive.id, namespace));
}
self.record_use(name, binding);
} }
Success(binding) Success(binding)
}) })
@ -3154,10 +3144,10 @@ impl<'a> Resolver<'a> {
if let NameBindingKind::Import { directive, .. } = binding.kind { if let NameBindingKind::Import { directive, .. } = binding.kind {
let id = directive.id; let id = directive.id;
this.maybe_unused_trait_imports.insert(id); this.maybe_unused_trait_imports.insert(id);
this.add_to_glob_map(id, trait_name);
import_id = Some(id); import_id = Some(id);
} }
add_trait_info(&mut found_traits, trait_def_id, import_id, name); add_trait_info(&mut found_traits, trait_def_id, import_id, name);
this.record_use(trait_name, binding);
} }
} }
}; };