Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitad810a5

Browse files
committed
Auto merge of#17277 - Veykril:find-path-fixes, r=Veykril
fix: Various find path fixesFixesrust-lang/rust-analyzer#17271
2 parentsd9dda8f +b1830a5 commitad810a5

File tree

33 files changed

+647
-346
lines changed

33 files changed

+647
-346
lines changed

‎src/tools/rust-analyzer/crates/hir-def/src/find_path.rs‎

Lines changed: 565 additions & 269 deletions
Large diffs are not rendered by default.

‎src/tools/rust-analyzer/crates/hir-def/src/import_map.rs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
//! A map of all publicly exported items in a crate.
22
3-
use std::{fmt, hash::BuildHasherDefault};
3+
use std::fmt;
44

55
use base_db::CrateId;
66
use fst::{raw::IndexedValue,Automaton,Streamer};
77
use hir_expand::name::Name;
8-
use indexmap::IndexMap;
98
use itertools::Itertools;
10-
use rustc_hash::{FxHashSet,FxHasher};
9+
use rustc_hash::FxHashSet;
1110
use smallvec::SmallVec;
1211
use stdx::{format_to,TupleExt};
1312
use triomphe::Arc;
@@ -17,7 +16,7 @@ use crate::{
1716
item_scope::{ImportOrExternCrate,ItemInNs},
1817
nameres::DefMap,
1918
visibility::Visibility,
20-
AssocItemId,ModuleDefId,ModuleId,TraitId,
19+
AssocItemId,FxIndexMap,ModuleDefId,ModuleId,TraitId,
2120
};
2221

2322
/// Item import details stored in the `ImportMap`.
@@ -58,7 +57,6 @@ enum IsTraitAssocItem {
5857
No,
5958
}
6059

61-
typeFxIndexMap<K,V> =IndexMap<K,V,BuildHasherDefault<FxHasher>>;
6260
typeImportMapIndex =FxIndexMap<ItemInNs,(SmallVec<[ImportInfo;1]>,IsTraitAssocItem)>;
6361

6462
implImportMap{

‎src/tools/rust-analyzer/crates/hir-def/src/item_scope.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ impl ItemScope {
295295
pub(crate)fnnames_of<T>(
296296
&self,
297297
item:ItemInNs,
298-
mutcb:implFnMut(&Name,Visibility,bool) ->Option<T>,
298+
mutcb:implFnMut(&Name,Visibility,/*declared*/bool) ->Option<T>,
299299
) ->Option<T>{
300300
match item{
301301
ItemInNs::Macros(def) =>self

‎src/tools/rust-analyzer/crates/hir-def/src/lib.rs‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,9 @@ use crate::{
106106
},
107107
};
108108

109+
typeFxIndexMap<K,V> =
110+
indexmap::IndexMap<K,V, std::hash::BuildHasherDefault<rustc_hash::FxHasher>>;
111+
109112
#[derive(Debug)]
110113
pubstructItemLoc<N:ItemTreeNode>{
111114
pubcontainer:ModuleId,
@@ -455,6 +458,26 @@ impl ModuleId {
455458
pubfnis_block_module(self) ->bool{
456459
self.block.is_some() &&self.local_id ==DefMap::ROOT
457460
}
461+
462+
pubfnis_within_block(self) ->bool{
463+
self.block.is_some()
464+
}
465+
466+
pubfnas_crate_root(&self) ->Option<CrateRootModuleId>{
467+
ifself.local_id ==DefMap::ROOT &&self.block.is_none(){
468+
Some(CrateRootModuleId{krate:self.krate})
469+
}else{
470+
None
471+
}
472+
}
473+
474+
pubfnderive_crate_root(&self) ->CrateRootModuleId{
475+
CrateRootModuleId{krate:self.krate}
476+
}
477+
478+
fnis_crate_root(&self) ->bool{
479+
self.local_id ==DefMap::ROOT &&self.block.is_none()
480+
}
458481
}
459482

460483
implPartialEq<CrateRootModuleId>forModuleId{

‎src/tools/rust-analyzer/crates/hir-def/src/nameres.rs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ use crate::{
8181
per_ns::PerNs,
8282
visibility::{Visibility,VisibilityExplicitness},
8383
AstId,BlockId,BlockLoc,CrateRootModuleId,EnumId,EnumVariantId,ExternCrateId,FunctionId,
84-
LocalModuleId,Lookup,MacroExpander,MacroId,ModuleId,ProcMacroId,UseId,
84+
FxIndexMap,LocalModuleId,Lookup,MacroExpander,MacroId,ModuleId,ProcMacroId,UseId,
8585
};
8686

8787
constPREDEFINED_TOOLS:&[SmolStr] =&[
@@ -137,7 +137,7 @@ pub struct DefMap {
137137
#[derive(Clone,Debug,PartialEq,Eq)]
138138
structDefMapCrateData{
139139
/// The extern prelude which contains all root modules of external crates that are in scope.
140-
extern_prelude:FxHashMap<Name,(CrateRootModuleId,Option<ExternCrateId>)>,
140+
extern_prelude:FxIndexMap<Name,(CrateRootModuleId,Option<ExternCrateId>)>,
141141

142142
/// Side table for resolving derive helpers.
143143
exported_derives:FxHashMap<MacroDefId,Box<[Name]>>,
@@ -163,7 +163,7 @@ struct DefMapCrateData {
163163
implDefMapCrateData{
164164
fnnew(edition:Edition) ->Self{
165165
Self{
166-
extern_prelude:FxHashMap::default(),
166+
extern_prelude:FxIndexMap::default(),
167167
exported_derives:FxHashMap::default(),
168168
fn_proc_macro_mapping:FxHashMap::default(),
169169
proc_macro_loading_error:None,
@@ -586,7 +586,8 @@ impl DefMap {
586586

587587
pub(crate)fnextern_prelude(
588588
&self,
589-
) ->implIterator<Item =(&Name,(CrateRootModuleId,Option<ExternCrateId>))> +'_{
589+
) ->implDoubleEndedIterator<Item =(&Name,(CrateRootModuleId,Option<ExternCrateId>))> +'_
590+
{
590591
self.data.extern_prelude.iter().map(|(name,&def)|(name, def))
591592
}
592593

‎src/tools/rust-analyzer/crates/hir-def/src/resolver.rs‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
//! Name resolution façade.
2-
use std::{fmt,hash::BuildHasherDefault,iter, mem};
2+
use std::{fmt, iter, mem};
33

44
use base_db::CrateId;
55
use hir_expand::{
66
name::{name,Name},
77
MacroDefId,
88
};
9-
use indexmap::IndexMap;
109
use intern::Interned;
1110
use rustc_hash::FxHashSet;
1211
use smallvec::{smallvec,SmallVec};
@@ -27,10 +26,10 @@ use crate::{
2726
type_ref::LifetimeRef,
2827
visibility::{RawVisibility,Visibility},
2928
AdtId,ConstId,ConstParamId,CrateRootModuleId,DefWithBodyId,EnumId,EnumVariantId,
30-
ExternBlockId,ExternCrateId,FunctionId,GenericDefId,GenericParamId,HasModule,ImplId,
31-
ItemContainerId,ItemTreeLoc,LifetimeParamId,LocalModuleId,Lookup,Macro2Id,MacroId,
32-
MacroRulesId,ModuleDefId,ModuleId,ProcMacroId,StaticId,StructId,TraitAliasId,TraitId,
33-
TypeAliasId,TypeOrConstParamId,TypeOwnerId,TypeParamId,UseId,VariantId,
29+
ExternBlockId,ExternCrateId,FunctionId,FxIndexMap,GenericDefId,GenericParamId,HasModule,
30+
ImplId,ItemContainerId,ItemTreeLoc,LifetimeParamId,LocalModuleId,Lookup,Macro2Id,
31+
MacroId,MacroRulesId,ModuleDefId,ModuleId,ProcMacroId,StaticId,StructId,TraitAliasId,
32+
TraitId,TypeAliasId,TypeOrConstParamId,TypeOwnerId,TypeParamId,UseId,VariantId,
3433
};
3534

3635
#[derive(Debug,Clone)]
@@ -957,7 +956,6 @@ fn to_type_ns(per_ns: PerNs) -> Option<(TypeNs, Option<ImportOrExternCrate>)> {
957956
Some((res, import))
958957
}
959958

960-
typeFxIndexMap<K,V> =IndexMap<K,V,BuildHasherDefault<rustc_hash::FxHasher>>;
961959
#[derive(Default)]
962960
structScopeNames{
963961
map:FxIndexMap<Name,SmallVec<[ScopeDef;1]>>,

‎src/tools/rust-analyzer/crates/hir-ty/src/display.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use either::Either;
1313
use hir_def::{
1414
data::adt::VariantData,
1515
db::DefDatabase,
16-
find_path,
16+
find_path::{self,PrefixKind},
1717
generics::{TypeOrConstParamData,TypeParamProvenance},
1818
item_scope::ItemInNs,
1919
lang_item::{LangItem,LangItemTarget},
@@ -999,6 +999,8 @@ impl HirDisplay for Ty {
999999
db.upcast(),
10001000
ItemInNs::Types((*def_id).into()),
10011001
module_id,
1002+
PrefixKind::Plain,
1003+
false,
10021004
false,
10031005
true,
10041006
){

‎src/tools/rust-analyzer/crates/hir/src/lib.rs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -788,7 +788,7 @@ impl Module {
788788

789789
/// Finds a path that can be used to refer to the given item from within
790790
/// this module, if possible.
791-
pubfnfind_use_path(
791+
pubfnfind_path(
792792
self,
793793
db:&dynDefDatabase,
794794
item:implInto<ItemInNs>,
@@ -799,26 +799,29 @@ impl Module {
799799
db,
800800
item.into().into(),
801801
self.into(),
802+
PrefixKind::Plain,
803+
false,
802804
prefer_no_std,
803805
prefer_prelude,
804806
)
805807
}
806808

807809
/// Finds a path that can be used to refer to the given item from within
808810
/// this module, if possible. This is used for returning import paths for use-statements.
809-
pubfnfind_use_path_prefixed(
811+
pubfnfind_use_path(
810812
self,
811813
db:&dynDefDatabase,
812814
item:implInto<ItemInNs>,
813815
prefix_kind:PrefixKind,
814816
prefer_no_std:bool,
815817
prefer_prelude:bool,
816818
) ->Option<ModPath>{
817-
hir_def::find_path::find_path_prefixed(
819+
hir_def::find_path::find_path(
818820
db,
819821
item.into().into(),
820822
self.into(),
821823
prefix_kind,
824+
true,
822825
prefer_no_std,
823826
prefer_prelude,
824827
)

‎src/tools/rust-analyzer/crates/hir/src/term_search/expr.rs‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
//! Type tree for term search
22
3-
use hir_def::find_path::PrefixKind;
43
use hir_expand::mod_path::ModPath;
54
use hir_ty::{
65
db::HirDatabase,
@@ -21,28 +20,8 @@ fn mod_item_path(
2120
prefer_prelude:bool,
2221
) ->Option<ModPath>{
2322
let db = sema_scope.db;
24-
// Account for locals shadowing items from module
25-
let name_hit_count = def.name(db).map(|def_name|{
26-
letmut name_hit_count =0;
27-
sema_scope.process_all_names(&mut |name, _|{
28-
if name == def_name{
29-
name_hit_count +=1;
30-
}
31-
});
32-
name_hit_count
33-
});
34-
3523
let m = sema_scope.module();
36-
match name_hit_count{
37-
Some(0..=1) |None => m.find_use_path(db.upcast(),*def, prefer_no_std, prefer_prelude),
38-
Some(_) => m.find_use_path_prefixed(
39-
db.upcast(),
40-
*def,
41-
PrefixKind::ByCrate,
42-
prefer_no_std,
43-
prefer_prelude,
44-
),
45-
}
24+
m.find_path(db.upcast(),*def, prefer_no_std, prefer_prelude)
4625
}
4726

4827
/// Helper function to get path to `ModuleDef` as string

‎src/tools/rust-analyzer/crates/ide-assists/src/handlers/add_missing_match_arms.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ fn build_pat(
462462
) ->Option<ast::Pat>{
463463
match var{
464464
ExtendedVariant::Variant(var) =>{
465-
let path =mod_path_to_ast(&module.find_use_path(
465+
let path =mod_path_to_ast(&module.find_path(
466466
db,
467467
ModuleDef::from(var),
468468
prefer_no_std,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp