squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Fix use crate as <name>; imports

Browse source
This commit is contained in:
Jonas Schievink 2021-03-17 22:24:51 +01:00
parent 9d691530d5
commit a54564378b
2 changed files with 37 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
crates/hir_def/src/nameres/collector.rs
View file

@ -656,26 +656,28 @@ impl DefCollector<'_> {
}
}
} else {
match import.path.segments().last() {
Some(last_segment) => {
let name = match &import.alias {
Some(ImportAlias::Alias(name)) => Some(name.clone()),
Some(ImportAlias::Underscore) => None,
None => Some(last_segment.clone()),
};
log::debug!("resolved import {:?} ({:?}) to {:?}", name, import, def);
// extern crates in the crate root are special-cased to insert entries into the extern prelude: rust-lang/rust#54658
if import.is_extern_crate && module_id == self.def_map.root {
if let (Some(def), Some(name)) = (def.take_types(), name.as_ref()) {
self.def_map.extern_prelude.insert(name.clone(), def);
}
let name = match &import.alias {
Some(ImportAlias::Alias(name)) => Some(name.clone()),
Some(ImportAlias::Underscore) => None,
None => match import.path.segments().last() {
Some(last_segment) => Some(last_segment.clone()),
None => {
cov_mark::hit!(bogus_paths);
return;
}
},
};
self.update(module_id, &[(name, def)], vis, ImportType::Named);
log::debug!("resolved import {:?} ({:?}) to {:?}", name, import, def);
// extern crates in the crate root are special-cased to insert entries into the extern prelude: rust-lang/rust#54658
if import.is_extern_crate && module_id == self.def_map.root {
if let (Some(def), Some(name)) = (def.take_types(), name.as_ref()) {
self.def_map.extern_prelude.insert(name.clone(), def);
}
None => cov_mark::hit!(bogus_paths),
}
self.update(module_id, &[(name, def)], vis, ImportType::Named);
}
}

19
crates/hir_def/src/nameres/tests.rs
View file

@ -713,3 +713,22 @@ pub fn f() {}
"#]],
);
}
#[test]
fn use_crate_as() {
check(
r#"
use crate as foo;
use foo::bar as baz;
fn bar() {}
"#,
expect![[r#"
crate
bar: v
baz: v
foo: t
"#]],
);
}