From 5d99ba1d9a5acf02a5cd50e456f164bd80b523b5 Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Thu, 4 Feb 2021 20:49:24 +0100 Subject: Make `ModPath`'s representation private --- crates/hir_def/src/resolver.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'crates/hir_def/src/resolver.rs') diff --git a/crates/hir_def/src/resolver.rs b/crates/hir_def/src/resolver.rs index 9021ea712..f9ad50301 100644 --- a/crates/hir_def/src/resolver.rs +++ b/crates/hir_def/src/resolver.rs @@ -164,7 +164,7 @@ impl Resolver { db: &dyn DefDatabase, path: &ModPath, ) -> Option<(TypeNs, Option)> { - let first_name = path.segments.first()?; + let first_name = path.segments().first()?; let skip_to_mod = path.kind != PathKind::Plain; for scope in self.scopes.iter().rev() { match scope { @@ -179,7 +179,7 @@ impl Resolver { Scope::GenericParams { params, def } => { if let Some(local_id) = params.find_type_by_name(first_name) { - let idx = if path.segments.len() == 1 { None } else { Some(1) }; + let idx = if path.segments().len() == 1 { None } else { Some(1) }; return Some(( TypeNs::GenericParam(TypeParamId { local_id, parent: *def }), idx, @@ -188,13 +188,13 @@ impl Resolver { } Scope::ImplDefScope(impl_) => { if first_name == &name![Self] { - let idx = if path.segments.len() == 1 { None } else { Some(1) }; + let idx = if path.segments().len() == 1 { None } else { Some(1) }; return Some((TypeNs::SelfType(*impl_), idx)); } } Scope::AdtScope(adt) => { if first_name == &name![Self] { - let idx = if path.segments.len() == 1 { None } else { Some(1) }; + let idx = if path.segments().len() == 1 { None } else { Some(1) }; return Some((TypeNs::AdtSelfType(*adt), idx)); } } @@ -270,9 +270,9 @@ impl Resolver { db: &dyn DefDatabase, path: &ModPath, ) -> Option { - let n_segments = path.segments.len(); + let n_segments = path.segments().len(); let tmp = name![self]; - let first_name = if path.is_self() { &tmp } else { path.segments.first()? }; + let first_name = if path.is_self() { &tmp } else { path.segments().first()? }; let skip_to_mod = path.kind != PathKind::Plain && !path.is_self(); for scope in self.scopes.iter().rev() { match scope { -- cgit v1.2.3