bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Make resolve_name_in_module solely responsible for tracking used crates in lib.rs

Browse source
This commit is contained in:
Jeffrey Seyfried 2016-02-07 19:29:51 +00:00
parent 34af2de409
commit 661b7ce830
1 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/librustc_resolve/lib.rs
View file

@ -1202,10 +1202,6 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
fn record_import_use(&mut self, name: Name, ns: Namespace, resolution: &ImportResolution<'a>) { fn record_import_use(&mut self, name: Name, ns: Namespace, resolution: &ImportResolution<'a>) {
let import_id = resolution.id; let import_id = resolution.id;
self.used_imports.insert((import_id, ns)); self.used_imports.insert((import_id, ns));
match resolution.target.as_ref().and_then(|target| target.target_module.def_id()) {
Some(DefId { krate, .. }) => { self.used_crates.insert(krate); }
_ => {}
};
if !self.make_glob_map { if !self.make_glob_map {
return; return;
@ -1299,11 +1295,6 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
// Check to see whether there are type bindings, and, if // Check to see whether there are type bindings, and, if
// so, whether there is a module within. // so, whether there is a module within.
if let Some(module_def) = target.binding.module() { if let Some(module_def) = target.binding.module() {
// track extern crates for unused_extern_crate lint
if let Some(did) = module_def.def_id() {
self.used_crates.insert(did.krate);
}
search_module = module_def; search_module = module_def;
// Keep track of the closest private module used // Keep track of the closest private module used
@ -1573,6 +1564,12 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
if let Some(binding) = module_.get_child(name, namespace) { if let Some(binding) = module_.get_child(name, namespace) {
debug!("(resolving name in module) found node as child"); debug!("(resolving name in module) found node as child");
if binding.is_extern_crate() {
// track the extern crate as used.
if let Some(DefId { krate, .. }) = binding.module().unwrap().def_id() {
self.used_crates.insert(krate);
}
}
return Success((Target::new(module_, binding, Shadowable::Never), false)); return Success((Target::new(module_, binding, Shadowable::Never), false));
} }
@ -2923,9 +2920,6 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
} }
_ => return None, _ => return None,
}; };
if let Some(DefId{krate: kid, ..}) = containing_module.def_id() {
self.used_crates.insert(kid);
}
return Some(def); return Some(def);
} }