bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir/src/term_search/expr.rs')
-rw-r--r--crates/hir/src/term_search/expr.rs18
1 files changed, 9 insertions, 9 deletions
diff --git a/crates/hir/src/term_search/expr.rs b/crates/hir/src/term_search/expr.rs
index 843831948a..e56f9e91e3 100644
--- a/crates/hir/src/term_search/expr.rs
+++ b/crates/hir/src/term_search/expr.rs
@@ -1,6 +1,6 @@
//! Type tree for term search
-use hir_def::ImportPathConfig;
+use hir_def::FindPathConfig;
use hir_expand::mod_path::ModPath;
use hir_ty::{
db::HirDatabase,
@@ -18,7 +18,7 @@ use crate::{
fn mod_item_path(
sema_scope: &SemanticsScope<'_>,
def: &ModuleDef,
- cfg: ImportPathConfig,
+ cfg: FindPathConfig,
) -> Option<ModPath> {
let db = sema_scope.db;
let m = sema_scope.module();
@@ -29,7 +29,7 @@ fn mod_item_path(
fn mod_item_path_str(
sema_scope: &SemanticsScope<'_>,
def: &ModuleDef,
- cfg: ImportPathConfig,
+ cfg: FindPathConfig,
edition: Edition,
) -> Result<String, DisplaySourceCodeError> {
let path = mod_item_path(sema_scope, def, cfg);
@@ -103,7 +103,7 @@ impl<'db> Expr<'db> {
&self,
sema_scope: &SemanticsScope<'db>,
many_formatter: &mut dyn FnMut(&Type<'db>) -> String,
- cfg: ImportPathConfig,
+ cfg: FindPathConfig,
display_target: DisplayTarget,
) -> Result<String, DisplaySourceCodeError> {
let db = sema_scope.db;
@@ -336,10 +336,10 @@ impl<'db> Expr<'db> {
if let Expr::Method { func, params, .. } = self {
res.extend(params.iter().flat_map(|it| it.traits_used(db)));
- if let Some(it) = func.as_assoc_item(db) {
- if let Some(it) = it.container_or_implemented_trait(db) {
- res.push(it);
- }
+ if let Some(it) = func.as_assoc_item(db)
+ && let Some(it) = it.container_or_implemented_trait(db)
+ {
+ res.push(it);
}
}
@@ -380,7 +380,7 @@ impl<'db> Expr<'db> {
fn container_name(
container: AssocItemContainer,
sema_scope: &SemanticsScope<'_>,
- cfg: ImportPathConfig,
+ cfg: FindPathConfig,
edition: Edition,
display_target: DisplayTarget,
) -> Result<String, DisplaySourceCodeError> {