cargo fmt

BenjaminBrienen · BenjaminBrienen · commit d9eaff369143 · 2025-03-09T17:10:58.000+01:00
diff --git a/crates/hir-def/src/macro_expansion_tests/mod.rs b/crates/hir-def/src/macro_expansion_tests/mod.rs
@@ -19,8 +19,7 @@ use std::{iter, ops::Range, sync};
 use base_db::SourceDatabase;
 use expect_test::Expect;
 use hir_expand::{
-    InFile, InFile, MacroCallKind, MacroCallKind, MacroFileId, MacroFileId, MacroFileIdExt,
-    MacroFileIdExt, MacroKind,
+    InFile, MacroCallKind, MacroFileId, MacroFileIdExt, MacroKind,
     db::ExpandDatabase,
     proc_macro::{ProcMacro, ProcMacroExpander, ProcMacroExpansionError, ProcMacroKind},
     span_map::SpanMapRef,
diff --git a/crates/hir-expand/src/files.rs b/crates/hir-expand/src/files.rs
@@ -9,7 +9,7 @@ use span::{
 use syntax::{AstNode, AstPtr, SyntaxNode, SyntaxNodePtr, SyntaxToken, TextRange, TextSize};
 
 use crate::{
-    MacroFileIdExt, MacroFileIdExt, MacroKind,
+    MacroFileIdExt, MacroKind,
     db::{self, ExpandDatabase},
     map_node_range_up, map_node_range_up_rooted, span_for_offset,
 };
diff --git a/crates/hir-ty/src/diagnostics.rs b/crates/hir-ty/src/diagnostics.rs
@@ -10,7 +10,7 @@ pub use crate::diagnostics::{
         BodyValidationDiagnostic, record_literal_missing_fields, record_pattern_missing_fields,
     },
     unsafe_check::{
-        missing_unsafe, unsafe_operations, unsafe_operations_for_body, InsideUnsafeBlock,
-        UnsafetyReason,
+        InsideUnsafeBlock, UnsafetyReason, missing_unsafe, unsafe_operations,
+        unsafe_operations_for_body,
     },
 };
diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs
@@ -130,8 +130,7 @@ pub use {
         {ModuleDefId, TraitId},
     },
     hir_expand::{
-        ExpandResult, ExpandResult, HirFileId, HirFileId, HirFileIdExt, HirFileIdExt, MacroFileId,
-        MacroFileId, MacroFileIdExt, MacroFileIdExt, MacroKind,
+        ExpandResult, HirFileId, HirFileIdExt, MacroFileId, MacroFileIdExt, MacroKind,
         attrs::{Attr, AttrId},
         change::ChangeWithProcMacros,
         files::{
diff --git a/crates/hir/src/semantics.rs b/crates/hir/src/semantics.rs
@@ -31,7 +31,7 @@ use hir_expand::{
     name::AsName,
 };
 use hir_ty::diagnostics::unsafe_operations_for_body;
-use intern::{sym, Symbol};
+use intern::{Symbol, sym};
 use itertools::Itertools;
 use rustc_hash::{FxHashMap, FxHashSet};
 use smallvec::{SmallVec, smallvec};
@@ -46,16 +46,16 @@ use syntax::{
 use triomphe::Arc;
 
 use crate::{
-    db::HirDatabase,
-    semantics::source_to_def::{ChildContainer, SourceToDefCache, SourceToDefCtx},
-    source_analyzer::{name_hygiene, resolve_hir_path, SourceAnalyzer},
     Adjust, Adjustment, Adt, AutoBorrow, BindingMode, BuiltinAttr, Callable, Const, ConstParam,
     Crate, DefWithBody, DeriveHelper, Enum, Field, Function, GenericSubstitution, HasSource,
     HirFileId, Impl, InFile, InlineAsmOperand, ItemInNs, Label, LifetimeParam, Local, Macro,
     Module, ModuleDef, Name, OverloadedDeref, Path, ScopeDef, Static, Struct, ToolModule, Trait,
     TraitAlias, TupleField, Type, TypeAlias, TypeParam, Union, Variant, VariantDef,
     db::HirDatabase,
+    db::HirDatabase,
     semantics::source_to_def::{ChildContainer, SourceToDefCache, SourceToDefCtx},
+    semantics::source_to_def::{ChildContainer, SourceToDefCache, SourceToDefCtx},
+    source_analyzer::{SourceAnalyzer, name_hygiene, resolve_hir_path},
     source_analyzer::{SourceAnalyzer, name_hygiene, resolve_hir_path},
 };
 
diff --git a/crates/hir/src/source_analyzer.rs b/crates/hir/src/source_analyzer.rs
@@ -37,8 +37,8 @@ use hir_ty::{
     Adjustment, InferenceResult, Interner, Substitution, TraitEnvironment, Ty, TyExt, TyKind,
     TyLoweringContext,
     diagnostics::{
-        record_literal_missing_fields, record_pattern_missing_fields, unsafe_operations,
-        InsideUnsafeBlock,
+        InsideUnsafeBlock, record_literal_missing_fields, record_pattern_missing_fields,
+        unsafe_operations,
     },
     from_assoc_type_id,
     lang_items::lang_items_for_bin_op,
diff --git a/crates/ide-assists/src/handlers/convert_bool_then.rs b/crates/ide-assists/src/handlers/convert_bool_then.rs
@@ -16,7 +16,6 @@ use syntax::{
 use crate::{
     AssistContext, AssistId, AssistKind, Assists,
     utils::{invert_boolean_expression, unwrap_trivial_block},
-    utils::{invert_boolean_expression_legacy, unwrap_trivial_block},
 };
 
 // Assist: convert_if_to_bool_then
diff --git a/crates/ide-assists/src/handlers/flip_comma.rs b/crates/ide-assists/src/handlers/flip_comma.rs
@@ -1,6 +1,5 @@
 use syntax::{
-    AstNode, AstNode, Direction, Direction, NodeOrToken, NodeOrToken, SyntaxElement, SyntaxKind,
-    SyntaxKind, SyntaxToken, SyntaxToken, T, T,
+    AstNode, Direction, NodeOrToken, SyntaxKind, SyntaxToken, T,
     algo::non_trivia_sibling,
     ast::{self, syntax_factory::SyntaxFactory},
     syntax_editor::SyntaxMapping,
diff --git a/crates/ide-assists/src/handlers/inline_local_variable.rs b/crates/ide-assists/src/handlers/inline_local_variable.rs
@@ -5,9 +5,9 @@ use ide_db::{
     search::{FileReference, FileReferenceNode, UsageSearchResult},
 };
 use syntax::{
-    ast::{self, syntax_factory::SyntaxFactory, AstNode, AstToken, HasName},
     SyntaxElement, TextRange,
     ast::{self, AstNode, AstToken, HasName},
+    ast::{self, AstNode, AstToken, HasName, syntax_factory::SyntaxFactory},
 };
 
 use crate::{
diff --git a/crates/ide-assists/src/handlers/unqualify_method_call.rs b/crates/ide-assists/src/handlers/unqualify_method_call.rs
@@ -1,8 +1,8 @@
 use ide_db::imports::insert_use::ImportScope;
 use syntax::{
     TextRange,
-    ast::{self, AstNode, HasArgList, make},
-    ast::{self, AstNode, HasArgList, prec::ExprPrecedence},
+    ast::prec::ExprPrecedence,
+    ast::{self, AstNode, HasArgList},
 };
 
 use crate::{AssistContext, AssistId, AssistKind, Assists};
diff --git a/crates/ide/src/syntax_highlighting.rs b/crates/ide/src/syntax_highlighting.rs
@@ -21,7 +21,10 @@ use hir::{
 use ide_db::{FxHashMap, FxHashSet, Ranker, RootDatabase, SymbolKind};
 use span::EditionedFileId;
 use syntax::{
-    AstNode, AstToken, NodeOrToken, SyntaxKind::*, SyntaxNode, SyntaxToken, T, TextRange, WalkEvent,
+    AstNode, AstToken, NodeOrToken,
+    SyntaxKind::*,
+    SyntaxNode, SyntaxToken, T, TextRange, WalkEvent,
+    ast::{self, IsString},
 };
 
 use crate::{
diff --git a/crates/ide/src/syntax_highlighting/highlight.rs b/crates/ide/src/syntax_highlighting/highlight.rs
@@ -5,17 +5,17 @@ use std::ops::ControlFlow;
 use either::Either;
 use hir::{AsAssocItem, HasVisibility, MacroFileIdExt, Semantics};
 use ide_db::{
-    defs::{Definition, IdentClass, NameClass, NameRefClass},
-    syntax_helpers::node_ext::walk_pat,
     FxHashMap, RootDatabase, SymbolKind,
     defs::{Definition, IdentClass, NameClass, NameRefClass},
+    defs::{Definition, IdentClass, NameClass, NameRefClass},
+    syntax_helpers::node_ext::walk_pat,
 };
 use span::Edition;
 use stdx::hash_once;
 use syntax::{
-    ast, match_ast, AstNode, AstPtr, AstToken, NodeOrToken,
+    AstNode, AstPtr, AstToken, NodeOrToken,
     SyntaxKind::{self, *},
-    SyntaxNode, SyntaxNodePtr, SyntaxToken, T,
+    SyntaxNode, SyntaxNodePtr, SyntaxToken, T, ast, match_ast,
 };
 
 use crate::{
@@ -144,11 +144,7 @@ fn punctuation(
             let ptr = operator_parent
                 .as_ref()
                 .and_then(|it| AstPtr::try_from_raw(SyntaxNodePtr::new(it)));
-            if ptr.is_some_and(is_unsafe_node) {
-                h | HlMod::Unsafe
-            } else {
-                h
-            }
+            if ptr.is_some_and(is_unsafe_node) { h | HlMod::Unsafe } else { h }
         }
         (T![-], PREFIX_EXPR) => {
             let prefix_expr =
@@ -224,11 +220,7 @@ fn punctuation(
                 let is_unsafe = is_unsafe_macro
                     || operator_parent
                         .and_then(|it| {
-                            if ast::ArgList::can_cast(it.kind()) {
-                                it.parent()
-                            } else {
-                                Some(it)
-                            }
+                            if ast::ArgList::can_cast(it.kind()) { it.parent() } else { Some(it) }
                         })
                         .and_then(|it| AstPtr::try_from_raw(SyntaxNodePtr::new(&it)))
                         .is_some_and(is_unsafe_node);
@@ -297,7 +289,7 @@ fn highlight_name_ref(
     let name_class = match NameRefClass::classify(sema, &name_ref) {
         Some(name_kind) => name_kind,
         None if syntactic_name_ref_highlighting => {
-            return highlight_name_ref_by_syntax(name_ref, sema, krate, is_unsafe_node)
+            return highlight_name_ref_by_syntax(name_ref, sema, krate, is_unsafe_node);
         }
         // FIXME: This is required for helper attributes used by proc-macros, as those do not map down
         // to anything when used.
@@ -819,11 +811,7 @@ fn highlight_name_ref_by_syntax(
             let h = HlTag::Symbol(SymbolKind::Field);
             let is_unsafe = ast::Expr::cast(parent)
                 .is_some_and(|it| is_unsafe_node(AstPtr::new(&it).wrap_left()));
-            if is_unsafe {
-                h | HlMod::Unsafe
-            } else {
-                h.into()
-            }
+            if is_unsafe { h | HlMod::Unsafe } else { h.into() }
         }
         PATH_SEGMENT => {
             let name_based_fallback = || {
diff --git a/crates/ra-salsa/src/derived/slot.rs b/crates/ra-salsa/src/derived/slot.rs
@@ -241,9 +241,9 @@ where
                             Q::cycle_fallback(db, &cycle, key)
                         } else {
                             // we are not a participant in this cycle
-                            debug_assert!(!cycle
-                                .participant_keys()
-                                .any(|k| k == self.database_key_index()));
+                            debug_assert!(
+                                !cycle.participant_keys().any(|k| k == self.database_key_index())
+                            );
                             cycle.throw()
                         }
                     }
diff --git a/crates/ra-salsa/src/derived_lru/slot.rs b/crates/ra-salsa/src/derived_lru/slot.rs
@@ -259,9 +259,9 @@ where
                             Q::cycle_fallback(db, &cycle, key)
                         } else {
                             // we are not a participant in this cycle
-                            debug_assert!(!cycle
-                                .participant_keys()
-                                .any(|k| k == self.database_key_index()));
+                            debug_assert!(
+                                !cycle.participant_keys().any(|k| k == self.database_key_index())
+                            );
                             cycle.throw()
                         }
                     }
@@ -378,10 +378,10 @@ where
                         value: value.clone(),
                     };
 
-                        trace!(
-                            "{:?}: returning memoized value changed at {:?}",
-                            self, value.changed_at
-                        );
+                    trace!(
+                        "{:?}: returning memoized value changed at {:?}",
+                        self, value.changed_at
+                    );
 
                     ProbeState::UpToDate(value)
                 } else {
diff --git a/crates/rust-analyzer/src/handlers/request.rs b/crates/rust-analyzer/src/handlers/request.rs
@@ -38,7 +38,7 @@ use crate::{
     hack_recover_crate_name,
     line_index::LineEndings,
     lsp::{
-        completion_item_hash,
+        LspError, completion_item_hash,
         ext::{
             InternalTestingFetchConfigOption, InternalTestingFetchConfigParams,
             InternalTestingFetchConfigResponse,
diff --git a/crates/rust-analyzer/src/lsp/to_proto.rs b/crates/rust-analyzer/src/lsp/to_proto.rs
@@ -37,6 +37,8 @@ use crate::{
     target_spec::{CargoTargetSpec, TargetSpec},
 };
 
+use super::LspError;
+
 pub(crate) fn position(line_index: &LineIndex, offset: TextSize) -> lsp_types::Position {
     let line_col = line_index.index.line_col(offset);
     match line_index.encoding {
diff --git a/crates/syntax/src/ast/prec.rs b/crates/syntax/src/ast/prec.rs
@@ -447,8 +447,8 @@ impl Expr {
     }
 
     fn is_ordered_before_parent_in_place_of(&self, parent: &Expr, place_of: &SyntaxNode) -> bool {
-        use rowan::TextSize;
         use Expr::*;
+        use rowan::TextSize;
 
         let self_range = self.syntax().text_range();
         let place_of_range = place_of.text_range();

Original file line number	Diff line number	Diff line change
`@@ -241,9 +241,9 @@ where`
`241`	`241`	`Q::cycle_fallback(db, &cycle, key)`
`242`	`242`	`} else {`
`243`	`243`	`// we are not a participant in this cycle`
`244`		`- debug_assert!(!cycle`
`245`		`- .participant_keys()`
`246`		`- .any(\|k\| k == self.database_key_index()));`
	`244`	`+ debug_assert!(`
	`245`	`+ !cycle.participant_keys().any(\|k\| k == self.database_key_index())`
	`246`	`+ );`
`247`	`247`	`cycle.throw()`
`248`	`248`	`}`
`249`	`249`	`}`
Original file line number	Diff line number	Diff line change
`@@ -447,8 +447,8 @@ impl Expr {`
`447`	`447`	`}`
`448`	`448`
`449`	`449`	`fn is_ordered_before_parent_in_place_of(&self, parent: &Expr, place_of: &SyntaxNode) -> bool {`
`450`		`- use rowan::TextSize;`
`451`	`450`	`use Expr::*;`
	`451`	`+ use rowan::TextSize;`
`452`	`452`
`453`	`453`	`let self_range = self.syntax().text_range();`
`454`	`454`	`let place_of_range = place_of.text_range();`