language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 14:21:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

DefMap: hide remaining crate-visible fields

Browse source
This commit is contained in:
Jonas Schievink 2021-01-20 18:17:48 +01:00
parent e62533c3ec
commit 5f319ca7ee
4 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/hir_def/src/find_path.rs
View file

@ -136,7 +136,7 @@ fn find_path_inner(
}
// - if the item is the crate root of a dependency crate, return the name from the extern prelude
for (name, def_id) in &def_map.extern_prelude {
for (name, def_id) in def_map.extern_prelude() {
if item == ItemInNs::Types(*def_id) {
let name = scope_name.unwrap_or_else(|| name.clone());
return Some(ModPath::from_segments(PathKind::Plain, vec![name]));
@ -144,7 +144,7 @@ fn find_path_inner(
}
// - if the item is in the prelude, return the name from there
if let Some(prelude_module) = def_map.prelude {
if let Some(prelude_module) = def_map.prelude() {
let prelude_def_map = db.crate_def_map(prelude_module.krate);
let prelude_scope: &crate::item_scope::ItemScope =
&prelude_def_map[prelude_module.local_id].scope;