Skip to content

Commit 845754a

Browse files
borsbors
committed
Auto merge of #17340 - Veykril:find-path2, r=Veykril
internal: Improve `find_path` performance cc rust-lang/rust-analyzer#17339, db80216dac3d972612d8e2d12ade3c28a1826ac2 should fix a case where we don't reduce our search space appropriately. This also adds a fuel system which really shouldn't ever be hit, hence why it warns
2 parents bdd2bd1 + 59cef9c commit 845754a

File tree

11 files changed

+180
-214
lines changed

11 files changed

+180
-214
lines changed

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

+136-173
Large diffs are not rendered by default.

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -242,11 +242,11 @@ impl ItemVisibilities {
242242
match &vis {
243243
RawVisibility::Public => RawVisibilityId::PUB,
244244
RawVisibility::Module(path, explicitiy) if path.segments().is_empty() => {
245-
match (&path.kind, explicitiy) {
246-
(PathKind::Super(0), VisibilityExplicitness::Explicit) => {
245+
match (path.kind, explicitiy) {
246+
(PathKind::SELF, VisibilityExplicitness::Explicit) => {
247247
RawVisibilityId::PRIV_EXPLICIT
248248
}
249-
(PathKind::Super(0), VisibilityExplicitness::Implicit) => {
249+
(PathKind::SELF, VisibilityExplicitness::Implicit) => {
250250
RawVisibilityId::PRIV_IMPLICIT
251251
}
252252
(PathKind::Crate, _) => RawVisibilityId::PUB_CRATE,
@@ -586,11 +586,11 @@ impl Index<RawVisibilityId> for ItemTree {
586586
fn index(&self, index: RawVisibilityId) -> &Self::Output {
587587
static VIS_PUB: RawVisibility = RawVisibility::Public;
588588
static VIS_PRIV_IMPLICIT: RawVisibility = RawVisibility::Module(
589-
ModPath::from_kind(PathKind::Super(0)),
589+
ModPath::from_kind(PathKind::SELF),
590590
VisibilityExplicitness::Implicit,
591591
);
592592
static VIS_PRIV_EXPLICIT: RawVisibility = RawVisibility::Module(
593-
ModPath::from_kind(PathKind::Super(0)),
593+
ModPath::from_kind(PathKind::SELF),
594594
VisibilityExplicitness::Explicit,
595595
);
596596
static VIS_PUB_CRATE: RawVisibility = RawVisibility::Module(
@@ -928,7 +928,7 @@ impl UseTree {
928928
_ => None,
929929
}
930930
}
931-
(Some(prefix), PathKind::Super(0)) if path.segments().is_empty() => {
931+
(Some(prefix), PathKind::SELF) if path.segments().is_empty() => {
932932
// `some::path::self` == `some::path`
933933
Some((prefix, ImportKind::TypeOnly))
934934
}

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

+20-18
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,23 @@ impl PartialEq<ModuleId> for CrateRootModuleId {
396396
other.block.is_none() && other.local_id == DefMap::ROOT && self.krate == other.krate
397397
}
398398
}
399+
impl PartialEq<CrateRootModuleId> for ModuleId {
400+
fn eq(&self, other: &CrateRootModuleId) -> bool {
401+
other == self
402+
}
403+
}
404+
405+
impl From<CrateRootModuleId> for ModuleId {
406+
fn from(CrateRootModuleId { krate }: CrateRootModuleId) -> Self {
407+
ModuleId { krate, block: None, local_id: DefMap::ROOT }
408+
}
409+
}
410+
411+
impl From<CrateRootModuleId> for ModuleDefId {
412+
fn from(value: CrateRootModuleId) -> Self {
413+
ModuleDefId::ModuleId(value.into())
414+
}
415+
}
399416

400417
impl From<CrateId> for CrateRootModuleId {
401418
fn from(krate: CrateId) -> Self {
@@ -472,6 +489,7 @@ impl ModuleId {
472489
self.block.is_some()
473490
}
474491

492+
/// Returns the [`CrateRootModuleId`] for this module if it is the crate root module.
475493
pub fn as_crate_root(&self) -> Option<CrateRootModuleId> {
476494
if self.local_id == DefMap::ROOT && self.block.is_none() {
477495
Some(CrateRootModuleId { krate: self.krate })
@@ -480,33 +498,17 @@ impl ModuleId {
480498
}
481499
}
482500

501+
/// Returns the [`CrateRootModuleId`] for this module.
483502
pub fn derive_crate_root(&self) -> CrateRootModuleId {
484503
CrateRootModuleId { krate: self.krate }
485504
}
486505

506+
/// Whether this module represents the crate root module
487507
fn is_crate_root(&self) -> bool {
488508
self.local_id == DefMap::ROOT && self.block.is_none()
489509
}
490510
}
491511

492-
impl PartialEq<CrateRootModuleId> for ModuleId {
493-
fn eq(&self, other: &CrateRootModuleId) -> bool {
494-
other == self
495-
}
496-
}
497-
498-
impl From<CrateRootModuleId> for ModuleId {
499-
fn from(CrateRootModuleId { krate }: CrateRootModuleId) -> Self {
500-
ModuleId { krate, block: None, local_id: DefMap::ROOT }
501-
}
502-
}
503-
504-
impl From<CrateRootModuleId> for ModuleDefId {
505-
fn from(value: CrateRootModuleId) -> Self {
506-
ModuleDefId::ModuleId(value.into())
507-
}
508-
}
509-
510512
/// An ID of a module, **local** to a `DefMap`.
511513
pub type LocalModuleId = Idx<nameres::ModuleData>;
512514

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ impl DefMap {
283283
// If we have a different `DefMap` from `self` (the original `DefMap` we started
284284
// with), resolve the remaining path segments in that `DefMap`.
285285
let path =
286-
ModPath::from_segments(PathKind::Super(0), path.segments().iter().cloned());
286+
ModPath::from_segments(PathKind::SELF, path.segments().iter().cloned());
287287
return def_map.resolve_path_fp_with_macro(
288288
db,
289289
mode,
@@ -333,7 +333,7 @@ impl DefMap {
333333
ModuleDefId::ModuleId(module) => {
334334
if module.krate != self.krate {
335335
let path = ModPath::from_segments(
336-
PathKind::Super(0),
336+
PathKind::SELF,
337337
path.segments()[i..].iter().cloned(),
338338
);
339339
tracing::debug!("resolving {:?} in other crate", path);

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ pub(super) fn lower_path(ctx: &LowerCtx<'_>, mut path: ast::Path) -> Option<Path
122122
// don't break out if `self` is the last segment of a path, this mean we got a
123123
// use tree like `foo::{self}` which we want to resolve as `foo`
124124
if !segments.is_empty() {
125-
kind = PathKind::Super(0);
125+
kind = PathKind::SELF;
126126
break;
127127
}
128128
}
@@ -144,7 +144,7 @@ pub(super) fn lower_path(ctx: &LowerCtx<'_>, mut path: ast::Path) -> Option<Path
144144

145145
if segments.is_empty() && kind == PathKind::Plain && type_anchor.is_none() {
146146
// plain empty paths don't exist, this means we got a single `self` segment as our path
147-
kind = PathKind::Super(0);
147+
kind = PathKind::SELF;
148148
}
149149

150150
// handle local_inner_macros :

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ pub(crate) fn print_path(db: &dyn DefDatabase, path: &Path, buf: &mut dyn Write)
5757
}
5858
None => match path.kind() {
5959
PathKind::Plain => {}
60-
PathKind::Super(0) => write!(buf, "self")?,
60+
&PathKind::SELF => write!(buf, "self")?,
6161
PathKind::Super(n) => {
6262
for i in 0..*n {
6363
if i == 0 {

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

+2-5
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,7 @@ pub enum RawVisibility {
2727

2828
impl RawVisibility {
2929
pub(crate) const fn private() -> RawVisibility {
30-
RawVisibility::Module(
31-
ModPath::from_kind(PathKind::Super(0)),
32-
VisibilityExplicitness::Implicit,
33-
)
30+
RawVisibility::Module(ModPath::from_kind(PathKind::SELF), VisibilityExplicitness::Implicit)
3431
}
3532

3633
pub(crate) fn from_ast(
@@ -60,7 +57,7 @@ impl RawVisibility {
6057
}
6158
ast::VisibilityKind::PubCrate => ModPath::from_kind(PathKind::Crate),
6259
ast::VisibilityKind::PubSuper => ModPath::from_kind(PathKind::Super(1)),
63-
ast::VisibilityKind::PubSelf => ModPath::from_kind(PathKind::Super(0)),
60+
ast::VisibilityKind::PubSelf => ModPath::from_kind(PathKind::SELF),
6461
ast::VisibilityKind::Pub => return RawVisibility::Public,
6562
};
6663
RawVisibility::Module(path, VisibilityExplicitness::Explicit)

‎src/tools/rust-analyzer/crates/hir-expand/src/mod_path.rs

+8-4
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ pub enum PathKind {
4444
DollarCrate(CrateId),
4545
}
4646

47+
impl PathKind {
48+
pub const SELF: PathKind = PathKind::Super(0);
49+
}
50+
4751
impl ModPath {
4852
pub fn from_src(
4953
db: &dyn ExpandDatabase,
@@ -96,7 +100,7 @@ impl ModPath {
96100
pub fn textual_len(&self) -> usize {
97101
let base = match self.kind {
98102
PathKind::Plain => 0,
99-
PathKind::Super(0) => "self".len(),
103+
PathKind::SELF => "self".len(),
100104
PathKind::Super(i) => "super".len() * i as usize,
101105
PathKind::Crate => "crate".len(),
102106
PathKind::Abs => 0,
@@ -113,7 +117,7 @@ impl ModPath {
113117
}
114118

115119
pub fn is_self(&self) -> bool {
116-
self.kind == PathKind::Super(0) && self.segments.is_empty()
120+
self.kind == PathKind::SELF && self.segments.is_empty()
117121
}
118122

119123
#[allow(non_snake_case)]
@@ -193,7 +197,7 @@ fn display_fmt_path(
193197
};
194198
match path.kind {
195199
PathKind::Plain => {}
196-
PathKind::Super(0) => add_segment("self")?,
200+
PathKind::SELF => add_segment("self")?,
197201
PathKind::Super(n) => {
198202
for _ in 0..n {
199203
add_segment("super")?;
@@ -316,7 +320,7 @@ fn convert_path_tt(db: &dyn ExpandDatabase, tt: &[tt::TokenTree]) -> Option<ModP
316320
tt::Leaf::Ident(tt::Ident { text, span }) if text == "$crate" => {
317321
resolve_crate_root(db, span.ctx).map(PathKind::DollarCrate).unwrap_or(PathKind::Crate)
318322
}
319-
tt::Leaf::Ident(tt::Ident { text, .. }) if text == "self" => PathKind::Super(0),
323+
tt::Leaf::Ident(tt::Ident { text, .. }) if text == "self" => PathKind::SELF,
320324
tt::Leaf::Ident(tt::Ident { text, .. }) if text == "super" => {
321325
let mut deg = 1;
322326
while let Some(tt::Leaf::Ident(tt::Ident { text, .. })) = leaves.next() {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1942,7 +1942,7 @@ impl HirDisplay for Path {
19421942
(_, PathKind::Plain) => {}
19431943
(_, PathKind::Abs) => {}
19441944
(_, PathKind::Crate) => write!(f, "crate")?,
1945-
(_, PathKind::Super(0)) => write!(f, "self")?,
1945+
(_, &PathKind::SELF) => write!(f, "self")?,
19461946
(_, PathKind::Super(n)) => {
19471947
for i in 0..*n {
19481948
if i > 0 {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ fn doc_modpath_from_str(link: &str) -> Option<ModPath> {
307307
let kind = match parts.next()? {
308308
"" => PathKind::Abs,
309309
"crate" => PathKind::Crate,
310-
"self" => PathKind::Super(0),
310+
"self" => PathKind::SELF,
311311
"super" => {
312312
let mut deg = 1;
313313
for segment in parts.by_ref() {

‎src/tools/rust-analyzer/crates/ide-db/src/helpers.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ pub fn mod_path_to_ast(path: &hir::ModPath) -> ast::Path {
4141
let mut is_abs = false;
4242
match path.kind {
4343
hir::PathKind::Plain => {}
44-
hir::PathKind::Super(0) => segments.push(make::path_segment_self()),
44+
hir::PathKind::SELF => segments.push(make::path_segment_self()),
4545
hir::PathKind::Super(n) => segments.extend((0..n).map(|_| make::path_segment_super())),
4646
hir::PathKind::DollarCrate(_) | hir::PathKind::Crate => {
4747
segments.push(make::path_segment_crate())

0 commit comments

Comments
 (0)