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

Lower extern crates to imports

Browse Source 
This is probably not completely correct, but it kind of works.
This commit is contained in:
Florian Diebold 2019-02-02 00:49:20 +01:00
parent 397d84ee29
commit d69023fc72
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
crates/ra_hir/src/nameres/lower.rs
View File

@ -8,7 +8,7 @@ use ra_arena::{Arena, RawId, impl_arena_id, map::ArenaMap};
use rustc_hash::FxHashMap; use rustc_hash::FxHashMap;
use crate::{ use crate::{
SourceItemId, Path, ModuleSource, Name, SourceItemId, Path, PathKind, ModuleSource, Name,
HirFileId, MacroCallLoc, AsName, PerNs, Function, HirFileId, MacroCallLoc, AsName, PerNs, Function,
ModuleDef, Module, Struct, Enum, Const, Static, Trait, Type, ModuleDef, Module, Struct, Enum, Const, Static, Trait, Type,
ids::LocationCtx, PersistentHirDatabase, ids::LocationCtx, PersistentHirDatabase,
@ -186,8 +186,21 @@ impl LoweredModule {
ast::ModuleItemKind::UseItem(it) => { ast::ModuleItemKind::UseItem(it) => {
self.add_use_item(source_map, it); self.add_use_item(source_map, it);
} }
ast::ModuleItemKind::ExternCrateItem(_) => { ast::ModuleItemKind::ExternCrateItem(it) => {
// TODO // Lower `extern crate x` to `use ::x`. This is kind of cheating
// and only works if we always interpret absolute paths in the
// 2018 style; otherwise `::x` could also refer to a module in
// the crate root.
if let Some(name_ref) = it.name_ref() {
let mut path = Path::from_name_ref(name_ref);
path.kind = PathKind::Abs;
let alias = it.alias().and_then(|a| a.name()).map(AsName::as_name);
self.imports.alloc(ImportData {
path,
alias,
is_glob: false,
});
}
} }
ast::ModuleItemKind::ConstDef(it) => { ast::ModuleItemKind::ConstDef(it) => {
if let Some(name) = it.name() { if let Some(name) = it.name() {