diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2022-01-13 19:08:38 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-13 19:08:38 +0000 |
| commit | 07ded2aef0b286c106fbd36d4e0e56ed7924639e (patch) | |
| tree | 50240a1a409a2ce7f49ecd504383c815e97abc94 | |
| parent | 1bfd903af04c025b20da2a7e5f2b92dc8c1e5d4d (diff) | |
| parent | 0721a55a487e55e6faaa014776b78757ee512f96 (diff) | |
| download | rust-07ded2aef0b286c106fbd36d4e0e56ed7924639e.tar.gz rust-07ded2aef0b286c106fbd36d4e0e56ed7924639e.zip | |
Merge #11277
11277: minor: reformat and fix warning r=lnicola a=lnicola bors r+ Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>
3 files changed, 3 insertions, 7 deletions
diff --git a/crates/ide_assists/src/handlers/expand_glob_import.rs b/crates/ide_assists/src/handlers/expand_glob_import.rs index 72c17b674c4..4def6543ab6 100644 --- a/crates/ide_assists/src/handlers/expand_glob_import.rs +++ b/crates/ide_assists/src/handlers/expand_glob_import.rs @@ -226,9 +226,7 @@ fn find_imported_defs(ctx: &AssistContext, star: SyntaxToken) -> Option<Vec<Defi .flat_map(|n| n.descendants().filter_map(ast::NameRef::cast)) .filter_map(|r| match NameRefClass::classify(&ctx.sema, &r)? { NameRefClass::Definition( - def - @ - (Definition::Macro(_) + def @ (Definition::Macro(_) | Definition::Module(_) | Definition::Function(_) | Definition::Adt(_) diff --git a/crates/ide_assists/src/handlers/replace_qualified_name_with_use.rs b/crates/ide_assists/src/handlers/replace_qualified_name_with_use.rs index b0b9ad440c4..3121e229817 100644 --- a/crates/ide_assists/src/handlers/replace_qualified_name_with_use.rs +++ b/crates/ide_assists/src/handlers/replace_qualified_name_with_use.rs @@ -216,7 +216,7 @@ fs::Path ", ); } - #[test] + #[test] fn dont_import_trivial_paths() { cov_mark::check!(dont_import_trivial_paths); diff --git a/crates/ide_completion/src/completions/qualified_path.rs b/crates/ide_completion/src/completions/qualified_path.rs index 2a89bd29fad..499791abc9a 100644 --- a/crates/ide_completion/src/completions/qualified_path.rs +++ b/crates/ide_completion/src/completions/qualified_path.rs @@ -171,9 +171,7 @@ pub(crate) fn complete_qualified_path(acc: &mut Completions, ctx: &CompletionCon } } hir::PathResolution::Def( - def - @ - (hir::ModuleDef::Adt(_) + def @ (hir::ModuleDef::Adt(_) | hir::ModuleDef::TypeAlias(_) | hir::ModuleDef::BuiltinType(_)), ) => { |