language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 06:41:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge #11277

Browse source 
11277: minor: reformat and fix warning r=lnicola a=lnicola

bors r+

Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>
This commit is contained in:
bors[bot] 2022-01-13 19:08:38 +00:00 • committed by GitHub
commit 07ded2aef0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/ide_assists/src/handlers/expand_glob_import.rs
View file

@ -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)) .flat_map(|n| n.descendants().filter_map(ast::NameRef::cast))
.filter_map(|r| match NameRefClass::classify(&ctx.sema, &r)? { .filter_map(|r| match NameRefClass::classify(&ctx.sema, &r)? {
NameRefClass::Definition( NameRefClass::Definition(
def def @ (Definition::Macro(_)
@
(Definition::Macro(_)
| Definition::Module(_) | Definition::Module(_)
| Definition::Function(_) | Definition::Function(_)
| Definition::Adt(_) | Definition::Adt(_)

2
crates/ide_assists/src/handlers/replace_qualified_name_with_use.rs
View file

@ -216,7 +216,7 @@ fs::Path
", ",
); );
} }
#[test]
#[test] #[test]
fn dont_import_trivial_paths() { fn dont_import_trivial_paths() {
cov_mark::check!(dont_import_trivial_paths); cov_mark::check!(dont_import_trivial_paths);

4
crates/ide_completion/src/completions/qualified_path.rs
View file

@ -171,9 +171,7 @@ pub(crate) fn complete_qualified_path(acc: &mut Completions, ctx: &CompletionCon
} }
} }
hir::PathResolution::Def( hir::PathResolution::Def(
def def @ (hir::ModuleDef::Adt(_)
@
(hir::ModuleDef::Adt(_)
| hir::ModuleDef::TypeAlias(_) | hir::ModuleDef::TypeAlias(_)
| hir::ModuleDef::BuiltinType(_)), | hir::ModuleDef::BuiltinType(_)),
) => { ) => {