Unnamed repository; edit this file 'description' to name the repository.
Run cargo fmt
35 files changed, 190 insertions, 45 deletions
diff --git a/crates/hir-def/src/path.rs b/crates/hir-def/src/path.rs index 7af7e5574d..2f13a9fbf0 100644 --- a/crates/hir-def/src/path.rs +++ b/crates/hir-def/src/path.rs @@ -188,7 +188,10 @@ impl<'a> PathSegments<'a> { } impl GenericArgs { - pub(crate) fn from_ast(lower_ctx: &LowerCtx<'_>, node: ast::GenericArgList) -> Option<GenericArgs> { + pub(crate) fn from_ast( + lower_ctx: &LowerCtx<'_>, + node: ast::GenericArgList, + ) -> Option<GenericArgs> { lower::lower_generic_args(lower_ctx, node) } diff --git a/crates/hir-ty/src/autoderef.rs b/crates/hir-ty/src/autoderef.rs index 837049cea3..b6f226dbfd 100644 --- a/crates/hir-ty/src/autoderef.rs +++ b/crates/hir-ty/src/autoderef.rs @@ -70,7 +70,10 @@ impl Iterator for Autoderef<'_, '_> { } } -pub(crate) fn autoderef_step(table: &mut InferenceTable<'_>, ty: Ty) -> Option<(AutoderefKind, Ty)> { +pub(crate) fn autoderef_step( + table: &mut InferenceTable<'_>, + ty: Ty, +) -> Option<(AutoderefKind, Ty)> { if let Some(derefed) = builtin_deref(&ty) { Some((AutoderefKind::Builtin, table.resolve_ty_shallow(derefed))) } else { diff --git a/crates/hir-ty/src/display.rs b/crates/hir-ty/src/display.rs index 6cd3e2b382..d2f9c2b8b1 100644 --- a/crates/hir-ty/src/display.rs +++ b/crates/hir-ty/src/display.rs @@ -952,7 +952,11 @@ fn write_bounds_like_dyn_trait( Ok(()) } -fn fmt_trait_ref(tr: &TraitRef, f: &mut HirFormatter<'_>, use_as: bool) -> Result<(), HirDisplayError> { +fn fmt_trait_ref( + tr: &TraitRef, + f: &mut HirFormatter<'_>, + use_as: bool, +) -> Result<(), HirDisplayError> { if f.should_truncate() { return write!(f, "{}", TYPE_HINT_TRUNCATION); } diff --git a/crates/hir-ty/src/infer.rs b/crates/hir-ty/src/infer.rs index 0a64b929a1..46eeea0e6f 100644 --- a/crates/hir-ty/src/infer.rs +++ b/crates/hir-ty/src/infer.rs @@ -140,7 +140,12 @@ trait PatLike: Into<ExprOrPatId> + Copy { impl PatLike for ExprId { type BindingMode = (); - fn infer(this: &mut InferenceContext<'_>, id: Self, expected_ty: &Ty, _: Self::BindingMode) -> Ty { + fn infer( + this: &mut InferenceContext<'_>, + id: Self, + expected_ty: &Ty, + _: Self::BindingMode, + ) -> Ty { this.infer_assignee_expr(id, expected_ty) } } diff --git a/crates/hir/src/display.rs b/crates/hir/src/display.rs index dda9d4a9d5..0e29c52ade 100644 --- a/crates/hir/src/display.rs +++ b/crates/hir/src/display.rs @@ -289,7 +289,10 @@ impl HirDisplay for ConstParam { } } -fn write_generic_params(def: GenericDefId, f: &mut HirFormatter<'_>) -> Result<(), HirDisplayError> { +fn write_generic_params( + def: GenericDefId, + f: &mut HirFormatter<'_>, +) -> Result<(), HirDisplayError> { let params = f.db.generic_params(def); if params.lifetimes.is_empty() && params.type_or_consts.iter().all(|x| x.1.const_param().is_none()) @@ -381,8 +384,9 @@ fn write_where_clause(def: GenericDefId, f: &mut HirFormatter<'_>) -> Result<(), let prev_pred = if pred_idx == 0 { None } else { Some(¶ms.where_predicates[pred_idx - 1]) }; - let new_predicate = - |f: &mut HirFormatter<'_>| f.write_str(if pred_idx == 0 { "\n " } else { ",\n " }); + let new_predicate = |f: &mut HirFormatter<'_>| { + f.write_str(if pred_idx == 0 { "\n " } else { ",\n " }) + }; match pred { WherePredicate::TypeBound { target, .. } if is_unnamed_type_target(target) => {} diff --git a/crates/ide-assists/src/handlers/add_missing_impl_members.rs b/crates/ide-assists/src/handlers/add_missing_impl_members.rs index 9d252e411f..7f2a26ad06 100644 --- a/crates/ide-assists/src/handlers/add_missing_impl_members.rs +++ b/crates/ide-assists/src/handlers/add_missing_impl_members.rs @@ -85,7 +85,10 @@ pub(crate) fn add_missing_impl_members(acc: &mut Assists, ctx: &AssistContext<'_ // $0fn bar(&self) {} // } // ``` -pub(crate) fn add_missing_default_members(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<()> { +pub(crate) fn add_missing_default_members( + acc: &mut Assists, + ctx: &AssistContext<'_>, +) -> Option<()> { add_missing_impl_members_inner( acc, ctx, diff --git a/crates/ide-assists/src/handlers/auto_import.rs b/crates/ide-assists/src/handlers/auto_import.rs index c086d9f1cd..949cf3167a 100644 --- a/crates/ide-assists/src/handlers/auto_import.rs +++ b/crates/ide-assists/src/handlers/auto_import.rs @@ -142,7 +142,9 @@ pub(crate) fn auto_import(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option< Some(()) } -pub(super) fn find_importable_node(ctx: &AssistContext<'_>) -> Option<(ImportAssets, SyntaxElement)> { +pub(super) fn find_importable_node( + ctx: &AssistContext<'_>, +) -> Option<(ImportAssets, SyntaxElement)> { if let Some(path_under_caret) = ctx.find_node_at_offset_with_descend::<ast::Path>() { ImportAssets::for_exact_path(&path_under_caret, &ctx.sema) .zip(Some(path_under_caret.syntax().clone().into())) diff --git a/crates/ide-assists/src/handlers/convert_iter_for_each_to_for.rs b/crates/ide-assists/src/handlers/convert_iter_for_each_to_for.rs index e42a52c4db..2cf370c090 100644 --- a/crates/ide-assists/src/handlers/convert_iter_for_each_to_for.rs +++ b/crates/ide-assists/src/handlers/convert_iter_for_each_to_for.rs @@ -32,7 +32,10 @@ use crate::{AssistContext, AssistId, AssistKind, Assists}; // } // } // ``` -pub(crate) fn convert_iter_for_each_to_for(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<()> { +pub(crate) fn convert_iter_for_each_to_for( + acc: &mut Assists, + ctx: &AssistContext<'_>, +) -> Option<()> { let method = ctx.find_node_at_offset::<ast::MethodCallExpr>()?; let closure = match method.arg_list()?.args().next()? { @@ -91,7 +94,10 @@ pub(crate) fn convert_iter_for_each_to_for(acc: &mut Assists, ctx: &AssistContex // }); // } // ``` -pub(crate) fn convert_for_loop_with_for_each(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<()> { +pub(crate) fn convert_for_loop_with_for_each( + acc: &mut Assists, + ctx: &AssistContext<'_>, +) -> Option<()> { let for_loop = ctx.find_node_at_offset::<ast::ForExpr>()?; let iterable = for_loop.iterable()?; let pat = for_loop.pat()?; diff --git a/crates/ide-assists/src/handlers/extract_function.rs b/crates/ide-assists/src/handlers/extract_function.rs index af39387cdd..52a55ead3a 100644 --- a/crates/ide-assists/src/handlers/extract_function.rs +++ b/crates/ide-assists/src/handlers/extract_function.rs @@ -1042,7 +1042,11 @@ fn generic_parents(parent: &SyntaxNode) -> Vec<GenericParent> { } /// checks if relevant var is used with `&mut` access inside body -fn has_exclusive_usages(ctx: &AssistContext<'_>, usages: &LocalUsages, body: &FunctionBody) -> bool { +fn has_exclusive_usages( + ctx: &AssistContext<'_>, + usages: &LocalUsages, + body: &FunctionBody, +) -> bool { usages .iter() .filter(|reference| body.contains_range(reference.range)) diff --git a/crates/ide-assists/src/handlers/generate_enum_projection_method.rs b/crates/ide-assists/src/handlers/generate_enum_projection_method.rs index e7646421c7..b19aa0f652 100644 --- a/crates/ide-assists/src/handlers/generate_enum_projection_method.rs +++ b/crates/ide-assists/src/handlers/generate_enum_projection_method.rs @@ -36,7 +36,10 @@ use crate::{ // } // } // ``` -pub(crate) fn generate_enum_try_into_method(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<()> { +pub(crate) fn generate_enum_try_into_method( + acc: &mut Assists, + ctx: &AssistContext<'_>, +) -> Option<()> { generate_enum_projection_method( acc, ctx, diff --git a/crates/ide-assists/src/handlers/generate_from_impl_for_enum.rs b/crates/ide-assists/src/handlers/generate_from_impl_for_enum.rs index 157ad3b74e..507ea012ba 100644 --- a/crates/ide-assists/src/handlers/generate_from_impl_for_enum.rs +++ b/crates/ide-assists/src/handlers/generate_from_impl_for_enum.rs @@ -20,7 +20,10 @@ use crate::{utils::generate_trait_impl_text, AssistContext, AssistId, AssistKind // } // } // ``` -pub(crate) fn generate_from_impl_for_enum(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<()> { +pub(crate) fn generate_from_impl_for_enum( + acc: &mut Assists, + ctx: &AssistContext<'_>, +) -> Option<()> { let variant = ctx.find_node_at_offset::<ast::Variant>()?; let variant_name = variant.name()?; let enum_ = ast::Adt::Enum(variant.parent_enum()); diff --git a/crates/ide-assists/src/handlers/move_bounds.rs b/crates/ide-assists/src/handlers/move_bounds.rs index 7fa1a0d2ca..176a3bf580 100644 --- a/crates/ide-assists/src/handlers/move_bounds.rs +++ b/crates/ide-assists/src/handlers/move_bounds.rs @@ -20,7 +20,10 @@ use crate::{AssistContext, AssistId, AssistKind, Assists}; // f(x) // } // ``` -pub(crate) fn move_bounds_to_where_clause(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<()> { +pub(crate) fn move_bounds_to_where_clause( + acc: &mut Assists, + ctx: &AssistContext<'_>, +) -> Option<()> { let type_param_list = ctx.find_node_at_offset::<ast::GenericParamList>()?; let mut type_params = type_param_list.type_or_const_params(); diff --git a/crates/ide-assists/src/handlers/move_guard.rs b/crates/ide-assists/src/handlers/move_guard.rs index 778a31f99d..b8f1b36deb 100644 --- a/crates/ide-assists/src/handlers/move_guard.rs +++ b/crates/ide-assists/src/handlers/move_guard.rs @@ -91,7 +91,10 @@ pub(crate) fn move_guard_to_arm_body(acc: &mut Assists, ctx: &AssistContext<'_>) // } // } // ``` -pub(crate) fn move_arm_cond_to_match_guard(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<()> { +pub(crate) fn move_arm_cond_to_match_guard( + acc: &mut Assists, + ctx: &AssistContext<'_>, +) -> Option<()> { let match_arm: MatchArm = ctx.find_node_at_offset::<MatchArm>()?; let match_pat = match_arm.pat()?; let arm_body = match_arm.expr()?; diff --git a/crates/ide-assists/src/handlers/reorder_fields.rs b/crates/ide-assists/src/handlers/reorder_fields.rs index 62e396d1dc..a899c7a645 100644 --- a/crates/ide-assists/src/handlers/reorder_fields.rs +++ b/crates/ide-assists/src/handlers/reorder_fields.rs @@ -86,7 +86,10 @@ fn replace<T: AstNode + PartialEq>( }); } -fn compute_fields_ranks(path: &ast::Path, ctx: &AssistContext<'_>) -> Option<FxHashMap<String, usize>> { +fn compute_fields_ranks( + path: &ast::Path, + ctx: &AssistContext<'_>, +) -> Option<FxHashMap<String, usize>> { let strukt = match ctx.sema.resolve_path(path) { Some(hir::PathResolution::Def(hir::ModuleDef::Adt(hir::Adt::Struct(it)))) => it, _ => return None, diff --git a/crates/ide-assists/src/handlers/reorder_impl_items.rs b/crates/ide-assists/src/handlers/reorder_impl_items.rs index 970bbaa0e7..208c3e109d 100644 --- a/crates/ide-assists/src/handlers/reorder_impl_items.rs +++ b/crates/ide-assists/src/handlers/reorder_impl_items.rs @@ -93,7 +93,10 @@ pub(crate) fn reorder_impl_items(acc: &mut Assists, ctx: &AssistContext<'_>) -> ) } -fn compute_item_ranks(path: &ast::Path, ctx: &AssistContext<'_>) -> Option<FxHashMap<String, usize>> { +fn compute_item_ranks( + path: &ast::Path, + ctx: &AssistContext<'_>, +) -> Option<FxHashMap<String, usize>> { let td = trait_definition(path, &ctx.sema)?; Some( diff --git a/crates/ide-assists/src/handlers/replace_try_expr_with_match.rs b/crates/ide-assists/src/handlers/replace_try_expr_with_match.rs index b825998cb7..38fccb3382 100644 --- a/crates/ide-assists/src/handlers/replace_try_expr_with_match.rs +++ b/crates/ide-assists/src/handlers/replace_try_expr_with_match.rs @@ -34,7 +34,10 @@ use crate::assist_context::{AssistContext, Assists}; // }; // } // ``` -pub(crate) fn replace_try_expr_with_match(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<()> { +pub(crate) fn replace_try_expr_with_match( + acc: &mut Assists, + ctx: &AssistContext<'_>, +) -> Option<()> { let qm_kw = ctx.find_token_syntax_at_offset(T![?])?; let qm_kw_parent = qm_kw.parent().and_then(ast::TryExpr::cast)?; diff --git a/crates/ide-completion/src/completions.rs b/crates/ide-completion/src/completions.rs index b1cabbb99d..149afcac9d 100644 --- a/crates/ide-completion/src/completions.rs +++ b/crates/ide-completion/src/completions.rs @@ -144,7 +144,12 @@ impl Completions { item.add_to(self); } - pub(crate) fn add_keyword_snippet(&mut self, ctx: &CompletionContext<'_>, kw: &str, snippet: &str) { + pub(crate) fn add_keyword_snippet( + &mut self, + ctx: &CompletionContext<'_>, + kw: &str, + snippet: &str, + ) { let mut item = CompletionItem::new(CompletionItemKind::Keyword, ctx.source_range(), kw); match ctx.config.snippet_cap { @@ -348,7 +353,11 @@ impl Completions { )); } - pub(crate) fn add_type_alias(&mut self, ctx: &CompletionContext<'_>, type_alias: hir::TypeAlias) { + pub(crate) fn add_type_alias( + &mut self, + ctx: &CompletionContext<'_>, + type_alias: hir::TypeAlias, + ) { let is_private_editable = match ctx.is_visible(&type_alias) { Visible::Yes => false, Visible::Editable => true, @@ -661,7 +670,11 @@ pub(super) fn complete_name_ref( } } -fn complete_patterns(acc: &mut Completions, ctx: &CompletionContext<'_>, pattern_ctx: &PatternContext) { +fn complete_patterns( + acc: &mut Completions, + ctx: &CompletionContext<'_>, + pattern_ctx: &PatternContext, +) { flyimport::import_on_the_fly_pat(acc, ctx, pattern_ctx); fn_param::complete_fn_param(acc, ctx, pattern_ctx); pattern::complete_pattern(acc, ctx, pattern_ctx); diff --git a/crates/ide-completion/src/completions/attribute/repr.rs b/crates/ide-completion/src/completions/attribute/repr.rs index cdd629824a..a29417133e 100644 --- a/crates/ide-completion/src/completions/attribute/repr.rs +++ b/crates/ide-completion/src/completions/attribute/repr.rs @@ -5,7 +5,11 @@ use syntax::ast; use crate::{context::CompletionContext, item::CompletionItem, Completions}; -pub(super) fn complete_repr(acc: &mut Completions, ctx: &CompletionContext<'_>, input: ast::TokenTree) { +pub(super) fn complete_repr( + acc: &mut Completions, + ctx: &CompletionContext<'_>, + input: ast::TokenTree, +) { if let Some(existing_reprs) = super::parse_comma_sep_expr(input) { for &ReprCompletion { label, snippet, lookup, collides } in REPR_COMPLETIONS { let repr_already_annotated = existing_reprs diff --git a/crates/ide-completion/src/completions/dot.rs b/crates/ide-completion/src/completions/dot.rs index 4f80031541..cf40ca489c 100644 --- a/crates/ide-completion/src/completions/dot.rs +++ b/crates/ide-completion/src/completions/dot.rs @@ -8,7 +8,11 @@ use crate::{ }; /// Complete dot accesses, i.e. fields or methods. -pub(crate) fn complete_dot(acc: &mut Completions, ctx: &CompletionContext<'_>, dot_access: &DotAccess) { +pub(crate) fn complete_dot( + acc: &mut Completions, + ctx: &CompletionContext<'_>, + dot_access: &DotAccess, +) { let receiver_ty = match dot_access { DotAccess { receiver_ty: Some(receiver_ty), .. } => &receiver_ty.original, _ => return, diff --git a/crates/ide-completion/src/completions/field.rs b/crates/ide-completion/src/completions/field.rs index 0e84d0a53e..870df63b7b 100644 --- a/crates/ide-completion/src/completions/field.rs +++ b/crates/ide-completion/src/completions/field.rs @@ -30,7 +30,10 @@ pub(crate) fn complete_field_list_tuple_variant( } } -pub(crate) fn complete_field_list_record_variant(acc: &mut Completions, ctx: &CompletionContext<'_>) { +pub(crate) fn complete_field_list_record_variant( + acc: &mut Completions, + ctx: &CompletionContext<'_>, +) { if ctx.qualifier_ctx.vis_node.is_none() { let mut add_keyword = |kw, snippet| acc.add_keyword_snippet(ctx, kw, snippet); add_keyword("pub(crate)", "pub(crate)"); diff --git a/crates/ide-completion/src/render.rs b/crates/ide-completion/src/render.rs index f3de4a94ca..3f25b294e0 100644 --- a/crates/ide-completion/src/render.rs +++ b/crates/ide-completion/src/render.rs @@ -158,7 +158,10 @@ pub(crate) fn render_tuple_field( item.build() } -pub(crate) fn render_type_inference(ty_string: String, ctx: &CompletionContext<'_>) -> CompletionItem { +pub(crate) fn render_type_inference( + ty_string: String, + ctx: &CompletionContext<'_>, +) -> CompletionItem { let mut builder = CompletionItem::new(CompletionItemKind::InferredType, ctx.source_range(), ty_string); builder.set_relevance(CompletionRelevance { is_definite: true, ..Default::default() }); diff --git a/crates/ide-db/src/defs.rs b/crates/ide-db/src/defs.rs index 26f63a2bd1..692a315720 100644 --- a/crates/ide-db/src/defs.rs +++ b/crates/ide-db/src/defs.rs @@ -130,7 +130,10 @@ pub enum IdentClass { } impl IdentClass { - pub fn classify_node(sema: &Semantics<'_, RootDatabase>, node: &SyntaxNode) -> Option<IdentClass> { + pub fn classify_node( + sema: &Semantics<'_, RootDatabase>, + node: &SyntaxNode, + ) -> Option<IdentClass> { match_ast! { match node { ast::Name(name) => NameClass::classify(sema, &name).map(IdentClass::NameClass), @@ -238,7 +241,10 @@ impl NameClass { }; return Some(NameClass::Definition(definition)); - fn classify_item(sema: &Semantics<'_, RootDatabase>, item: ast::Item) -> Option<Definition> { + fn classify_item( + sema: &Semantics<'_, RootDatabase>, + item: ast::Item, + ) -> Option<Definition> { let definition = match item { ast::Item::MacroRules(it) => { Definition::Macro(sema.to_def(&ast::Macro::MacroRules(it))?) diff --git a/crates/ide-db/src/imports/import_assets.rs b/crates/ide-db/src/imports/import_assets.rs index 8378e323ed..26ef86155e 100644 --- a/crates/ide-db/src/imports/import_assets.rs +++ b/crates/ide-db/src/imports/import_assets.rs @@ -218,7 +218,10 @@ impl ImportAssets { } /// This may return non-absolute paths if a part of the returned path is already imported into scope. - pub fn search_for_relative_paths(&self, sema: &Semantics<'_, RootDatabase>) -> Vec<LocatedImport> { + pub fn search_for_relative_paths( + &self, + sema: &Semantics<'_, RootDatabase>, + ) -> Vec<LocatedImport> { let _p = profile::span("import_assets::search_for_relative_paths"); self.search_for(sema, None) } diff --git a/crates/ide-db/src/rename.rs b/crates/ide-db/src/rename.rs index 435a99aa0f..bb466e43e7 100644 --- a/crates/ide-db/src/rename.rs +++ b/crates/ide-db/src/rename.rs @@ -66,7 +66,11 @@ macro_rules! _bail { pub use _bail as bail; impl Definition { - pub fn rename(&self, sema: &Semantics<'_, RootDatabase>, new_name: &str) -> Result<SourceChange> { + pub fn rename( + &self, + sema: &Semantics<'_, RootDatabase>, + new_name: &str, + ) -> Result<SourceChange> { match *self { Definition::Module(module) => rename_mod(sema, module, new_name), Definition::BuiltinType(_) => { diff --git a/crates/ide-diagnostics/src/handlers/unlinked_file.rs b/crates/ide-diagnostics/src/handlers/unlinked_file.rs index 80bd055c78..c626932f19 100644 --- a/crates/ide-diagnostics/src/handlers/unlinked_file.rs +++ b/crates/ide-diagnostics/src/handlers/unlinked_file.rs @@ -18,7 +18,11 @@ use crate::{fix, Assist, Diagnostic, DiagnosticsContext, Severity}; // // This diagnostic is shown for files that are not included in any crate, or files that are part of // crates rust-analyzer failed to discover. The file will not have IDE features available. -pub(crate) fn unlinked_file(ctx: &DiagnosticsContext<'_>, acc: &mut Vec<Diagnostic>, file_id: FileId) { +pub(crate) fn unlinked_file( + ctx: &DiagnosticsContext<'_>, + acc: &mut Vec<Diagnostic>, + file_id: FileId, +) { // Limit diagnostic to the first few characters in the file. This matches how VS Code // renders it with the full span, but on other editors, and is less invasive. let range = ctx.sema.db.parse(file_id).syntax_node().text_range(); diff --git a/crates/ide-ssr/src/from_comment.rs b/crates/ide-ssr/src/from_comment.rs index 2c9c25b96c..5b6e016251 100644 --- a/crates/ide-ssr/src/from_comment.rs +++ b/crates/ide-ssr/src/from_comment.rs @@ -15,7 +15,10 @@ use crate::MatchFinder; /// Attempts to build an SSR MatchFinder from a comment at the given file /// range. If successful, returns the MatchFinder and a TextRange covering /// comment. -pub fn ssr_from_comment(db: &RootDatabase, frange: FileRange) -> Option<(MatchFinder<'_>, TextRange)> { +pub fn ssr_from_comment( + db: &RootDatabase, + frange: FileRange, +) -> Option<(MatchFinder<'_>, TextRange)> { let comment = { let file = db.parse(frange.file_id); file.tree().syntax().token_at_offset(frange.range.start()).find_map(ast::Comment::cast) diff --git a/crates/ide-ssr/src/nester.rs b/crates/ide-ssr/src/nester.rs index c6a765070e..afaaafd1fb 100644 --- a/crates/ide-ssr/src/nester.rs +++ b/crates/ide-ssr/src/nester.rs @@ -54,7 +54,11 @@ impl MatchCollector { } /// Attempts to add `m` as a sub-match of `existing`. -fn try_add_sub_match(m: Match, existing: &mut Match, sema: &hir::Semantics<'_, ide_db::RootDatabase>) { +fn try_add_sub_match( + m: Match, + existing: &mut Match, + sema: &hir::Semantics<'_, ide_db::RootDatabase>, +) { for p in existing.placeholder_values.values_mut() { // Note, no need to check if p.range.file is equal to m.range.file, since we // already know we're within `existing`. diff --git a/crates/ide/src/expand_macro.rs b/crates/ide/src/expand_macro.rs index 136d3dec80..efa8551a00 100644 --- a/crates/ide/src/expand_macro.rs +++ b/crates/ide/src/expand_macro.rs @@ -107,7 +107,10 @@ fn expand_macro_recur( expand(sema, expanded, ast::MacroCall::cast, expand_macro_recur) } -fn expand_attr_macro_recur(sema: &Semantics<'_, RootDatabase>, item: &ast::Item) -> Option<SyntaxNode> { +fn expand_attr_macro_recur( + sema: &Semantics<'_, RootDatabase>, + item: &ast::Item, +) -> Option<SyntaxNode> { let expanded = sema.expand_attr_macro(item)?.clone_for_update(); expand(sema, expanded, ast::Item::cast, expand_attr_macro_recur) } diff --git a/crates/ide/src/goto_implementation.rs b/crates/ide/src/goto_implementation.rs index b29ee44e5b..04b51c8394 100644 --- a/crates/ide/src/goto_implementation.rs +++ b/crates/ide/src/goto_implementation.rs @@ -90,7 +90,10 @@ fn impls_for_ty(sema: &Semantics<'_, RootDatabase>, ty: hir::Type) -> Vec<Naviga Impl::all_for_type(sema.db, ty).into_iter().filter_map(|imp| imp.try_to_nav(sema.db)).collect() } -fn impls_for_trait(sema: &Semantics<'_, RootDatabase>, trait_: hir::Trait) -> Vec<NavigationTarget> { +fn impls_for_trait( + sema: &Semantics<'_, RootDatabase>, + trait_: hir::Trait, +) -> Vec<NavigationTarget> { Impl::all_for_trait(sema.db, trait_) .into_iter() .filter_map(|imp| imp.try_to_nav(sema.db)) diff --git a/crates/ide/src/rename.rs b/crates/ide/src/rename.rs index 9f64ddea20..fe44856dca 100644 --- a/crates/ide/src/rename.rs +++ b/crates/ide/src/rename.rs @@ -201,7 +201,10 @@ fn find_definitions( } } -fn rename_to_self(sema: &Semantics<'_, RootDatabase>, local: hir::Local) -> RenameResult<SourceChange> { +fn rename_to_self( + sema: &Semantics<'_, RootDatabase>, + local: hir::Local, +) -> RenameResult<SourceChange> { if never!(local.is_self(sema.db)) { bail!("rename_to_self invoked on self"); } diff --git a/crates/ide/src/runnables.rs b/crates/ide/src/runnables.rs index b2869d44ac..bec770ed99 100644 --- a/crates/ide/src/runnables.rs +++ b/crates/ide/src/runnables.rs @@ -304,7 +304,10 @@ fn parent_test_module(sema: &Semantics<'_, RootDatabase>, fn_def: &ast::Fn) -> O }) } -pub(crate) fn runnable_fn(sema: &Semantics<'_, RootDatabase>, def: hir::Function) -> Option<Runnable> { +pub(crate) fn runnable_fn( + sema: &Semantics<'_, RootDatabase>, + def: hir::Function, +) -> Option<Runnable> { let func = def.source(sema.db)?; let name = def.name(sema.db).to_smol_str(); @@ -340,7 +343,10 @@ pub(crate) fn runnable_fn(sema: &Semantics<'_, RootDatabase>, def: hir::Function Some(Runnable { use_name_in_title: false, nav, kind, cfg }) } -pub(crate) fn runnable_mod(sema: &Semantics<'_, RootDatabase>, def: hir::Module) -> Option<Runnable> { +pub(crate) fn runnable_mod( + sema: &Semantics<'_, RootDatabase>, + def: hir::Module, +) -> Option<Runnable> { if !has_test_function_or_multiple_test_submodules(sema, &def) { return None; } @@ -353,7 +359,10 @@ pub(crate) fn runnable_mod(sema: &Semantics<'_, RootDatabase>, def: hir::Module) Some(Runnable { use_name_in_title: false, nav, kind: RunnableKind::TestMod { path }, cfg }) } -pub(crate) fn runnable_impl(sema: &Semantics<'_, RootDatabase>, def: &hir::Impl) -> Option<Runnable> { +pub(crate) fn runnable_impl( + sema: &Semantics<'_, RootDatabase>, + def: &hir::Impl, +) -> Option<Runnable> { let attrs = def.attrs(sema.db); if !has_runnable_doc_test(&attrs) { return None; diff --git a/crates/ide/src/syntax_highlighting/highlight.rs b/crates/ide/src/syntax_highlighting/highlight.rs index 42adca4958..fd3723ed45 100644 --- a/crates/ide/src/syntax_highlighting/highlight.rs +++ b/crates/ide/src/syntax_highlighting/highlight.rs @@ -79,7 +79,11 @@ pub(super) fn name_like( Some((highlight, binding_hash)) } -fn punctuation(sema: &Semantics<'_, RootDatabase>, token: SyntaxToken, kind: SyntaxKind) -> Highlight { +fn punctuation( + sema: &Semantics<'_, RootDatabase>, + token: SyntaxToken, + kind: SyntaxKind, +) -> Highlight { let parent = token.parent(); let parent_kind = parent.as_ref().map_or(EOF, SyntaxNode::kind); match (kind, parent_kind) { @@ -321,7 +325,11 @@ fn calc_binding_hash(name: &hir::Name, shadow_count: u32) -> u64 { hash((name, shadow_count)) } -fn highlight_def(sema: &Semantics<'_, RootDatabase>, krate: hir::Crate, def: Definition) -> Highlight { +fn highlight_def( + sema: &Semantics<'_, RootDatabase>, + krate: hir::Crate, + def: Definition, +) -> Highlight { let db = sema.db; let mut h = match def { Definition::Macro(m) => Highlight::new(HlTag::Symbol(m.kind(sema.db).into())), diff --git a/crates/parser/src/grammar/expressions.rs b/crates/parser/src/grammar/expressions.rs index 8887f3330b..e7402104eb 100644 --- a/crates/parser/src/grammar/expressions.rs +++ b/crates/parser/src/grammar/expressions.rs @@ -19,7 +19,10 @@ pub(super) fn expr(p: &mut Parser<'_>) -> bool { expr_bp(p, None, r, 1).is_some() } -pub(super) fn expr_stmt(p: &mut Parser<'_>, m: Option<Marker>) -> Option<(CompletedMarker, BlockLike)> { +pub(super) fn expr_stmt( + p: &mut Parser<'_>, + m: Option<Marker>, +) -> Option<(CompletedMarker, BlockLike)> { let r = Restrictions { forbid_structs: false, prefer_stmt: true }; expr_bp(p, m, r, 1) } diff --git a/crates/parser/src/grammar/expressions/atom.rs b/crates/parser/src/grammar/expressions/atom.rs index 30aadb1f9d..99f42a2662 100644 --- a/crates/parser/src/grammar/expressions/atom.rs +++ b/crates/parser/src/grammar/expressions/atom.rs @@ -60,7 +60,10 @@ pub(super) const ATOM_EXPR_FIRST: TokenSet = const EXPR_RECOVERY_SET: TokenSet = TokenSet::new(&[T![let]]); -pub(super) fn atom_expr(p: &mut Parser<'_>, r: Restrictions) -> Option<(CompletedMarker, BlockLike)> { +pub(super) fn atom_expr( + p: &mut Parser<'_>, + r: Restrictions, +) -> Option<(CompletedMarker, BlockLike)> { if let Some(m) = literal(p) { return Some((m, BlockLike::NotBlock)); } diff --git a/crates/parser/src/grammar/paths.rs b/crates/parser/src/grammar/paths.rs index 22c7f003f4..f9efcef92a 100644 --- a/crates/parser/src/grammar/paths.rs +++ b/crates/parser/src/grammar/paths.rs @@ -27,7 +27,10 @@ pub(super) fn expr_path(p: &mut Parser<'_>) { path(p, Mode::Expr); } -pub(crate) fn type_path_for_qualifier(p: &mut Parser<'_>, qual: CompletedMarker) -> CompletedMarker { +pub(crate) fn type_path_for_qualifier( + p: &mut Parser<'_>, + qual: CompletedMarker, +) -> CompletedMarker { path_for_qualifier(p, Mode::Type, qual) } @@ -45,7 +48,11 @@ fn path(p: &mut Parser<'_>, mode: Mode) { path_for_qualifier(p, mode, qual); } -fn path_for_qualifier(p: &mut Parser<'_>, mode: Mode, mut qual: CompletedMarker) -> CompletedMarker { +fn path_for_qualifier( + p: &mut Parser<'_>, + mode: Mode, + mut qual: CompletedMarker, +) -> CompletedMarker { loop { let use_tree = matches!(p.nth(2), T![*] | T!['{']); if p.at(T![::]) && !use_tree { |