From bf13549ab639d142342255109725351dbba1288c Mon Sep 17 00:00:00 2001 From: Hayashi Mikihiro <34ttrweoewiwe28@gmail.com> Date: Thu, 15 May 2025 13:18:30 +0900 Subject: [PATCH] rename fn name take_path to any Signed-off-by: Hayashi Mikihiro <34ttrweoewiwe28@gmail.com> --- crates/hir/src/semantics.rs | 2 +- crates/hir/src/source_analyzer.rs | 6 +++--- crates/ide-assists/src/handlers/remove_unused_imports.rs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crates/hir/src/semantics.rs b/crates/hir/src/semantics.rs index 7ee72614e2..caa6700de9 100644 --- a/crates/hir/src/semantics.rs +++ b/crates/hir/src/semantics.rs @@ -118,7 +118,7 @@ impl PathResolutionPerNs { ) -> Self { PathResolutionPerNs { type_ns, value_ns, macro_ns } } - pub fn take_path(&self) -> Option { + pub fn any(&self) -> Option { self.type_ns.or(self.value_ns).or(self.macro_ns) } } diff --git a/crates/hir/src/source_analyzer.rs b/crates/hir/src/source_analyzer.rs index 610770d0f3..ea21546f9d 100644 --- a/crates/hir/src/source_analyzer.rs +++ b/crates/hir/src/source_analyzer.rs @@ -1163,7 +1163,7 @@ impl<'db> SourceAnalyzer<'db> { Some(&store), false, ) - .take_path()?; + .any()?; let subst = (|| { let parent = parent()?; let ty = if let Some(expr) = ast::Expr::cast(parent.clone()) { @@ -1556,7 +1556,7 @@ pub(crate) fn resolve_hir_path( hygiene: HygieneId, store: Option<&ExpressionStore>, ) -> Option { - resolve_hir_path_(db, resolver, path, false, hygiene, store, false).take_path() + resolve_hir_path_(db, resolver, path, false, hygiene, store, false).any() } #[inline] @@ -1677,7 +1677,7 @@ fn resolve_hir_path_( .unwrap_or_else(|| PathResolutionPerNs::new(None, values(), None)) }; - if res.take_path().is_some() { + if res.any().is_some() { res } else if let Some(type_ns) = items() { PathResolutionPerNs::new(Some(type_ns), None, None) diff --git a/crates/ide-assists/src/handlers/remove_unused_imports.rs b/crates/ide-assists/src/handlers/remove_unused_imports.rs index fb96882ed4..dff9a660cf 100644 --- a/crates/ide-assists/src/handlers/remove_unused_imports.rs +++ b/crates/ide-assists/src/handlers/remove_unused_imports.rs @@ -81,7 +81,7 @@ pub(crate) fn remove_unused_imports(acc: &mut Assists, ctx: &AssistContext<'_>) // Get the actual definition associated with this use item. let res = match ctx.sema.resolve_path_per_ns(&path) { - Some(x) if x.take_path().is_some() => x, + Some(x) if x.any().is_some() => x, Some(_) | None => { return None; }