Skip to content

Commit 8de23af

Browse files
fix: rustfmt and clippy
1 parent 99ace2e commit 8de23af

File tree

2 files changed

+29
-13
lines changed

2 files changed

+29
-13
lines changed

crates/ide-completion/src/tests/flyimport.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1460,7 +1460,8 @@ enum Foo {
14601460

14611461
#[test]
14621462
fn flyimport_enum_variant_not_shadow_by_fn() {
1463-
check(r#"
1463+
check(
1464+
r#"
14641465
//- /std.rs crate:std
14651466
pub enum Result<T, E> {
14661467
Ok(T),
@@ -1477,7 +1478,8 @@ fn main() -> Result<(), ()> {
14771478
Ok$0
14781479
}
14791480
"#,
1480-
expect![[r#""#]])
1481+
expect![[r#""#]],
1482+
)
14811483
}
14821484

14831485
#[test]

crates/ide-db/src/imports/import_assets.rs

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -288,28 +288,42 @@ impl ImportAssets {
288288
};
289289
fn will_shadow(db: &dyn HirDatabase, cur: ModuleDef, other: ModuleDef) -> bool {
290290
match (cur, other) {
291-
(ModuleDef::Module(a), ModuleDef::Module(b)) => a.name(db) == b.name(db),
292-
(ModuleDef::Function(a), ModuleDef::Function(b)) => a.name(db) == b.name(db),
291+
(ModuleDef::Module(a), ModuleDef::Module(b)) => {
292+
a.name(db) == b.name(db)
293+
}
294+
(ModuleDef::Function(a), ModuleDef::Function(b)) => {
295+
a.name(db) == b.name(db)
296+
}
293297
(ModuleDef::Adt(a), ModuleDef::Adt(b)) => a.name(db) == b.name(db),
294-
(ModuleDef::Variant(a), ModuleDef::Variant(b)) => a.name(db) == b.name(db),
295-
(ModuleDef::Variant(a), ModuleDef::Function(b)) => a.name(db) == b.name(db),
298+
(ModuleDef::Variant(a), ModuleDef::Variant(b)) => {
299+
a.name(db) == b.name(db)
300+
}
301+
(ModuleDef::Variant(a), ModuleDef::Function(b)) => {
302+
a.name(db) == b.name(db)
303+
}
296304
(ModuleDef::Const(a), ModuleDef::Const(b)) => a.name(db) == b.name(db),
297-
(ModuleDef::Static(a), ModuleDef::Static(b)) => a.name(db) == b.name(db),
305+
(ModuleDef::Static(a), ModuleDef::Static(b)) => {
306+
a.name(db) == b.name(db)
307+
}
298308
(ModuleDef::Trait(a), ModuleDef::Trait(b)) => a.name(db) == b.name(db),
299-
(ModuleDef::TraitAlias(a), ModuleDef::TraitAlias(b)) => a.name(db) == b.name(db),
300-
(ModuleDef::TypeAlias(a), ModuleDef::TypeAlias(b)) => a.name(db) == b.name(db),
309+
(ModuleDef::TraitAlias(a), ModuleDef::TraitAlias(b)) => {
310+
a.name(db) == b.name(db)
311+
}
312+
(ModuleDef::TypeAlias(a), ModuleDef::TypeAlias(b)) => {
313+
a.name(db) == b.name(db)
314+
}
301315
(ModuleDef::Macro(a), ModuleDef::Macro(b)) => a.name(db) == b.name(db),
302316
(_, _) => false,
303317
}
304318
}
305319

306320
!scope_definitions.contains(&ScopeDef::from(item_to_import))
307-
&& scope_definitions.iter().find(|&&scope_def| match scope_def {
321+
&& !scope_definitions.iter().any(|&scope_def| match scope_def {
308322
ScopeDef::ModuleDef(module_def) => {
309323
will_shadow(sema.db, module_def, import_def)
310-
},
311-
_ => false
312-
}).is_none()
324+
}
325+
_ => false,
326+
})
313327
})
314328
}
315329
ImportCandidate::TraitAssocItem(trait_candidate)

0 commit comments

Comments
 (0)