cargo fmt

Author: BenjaminBrienen

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,

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,
 };

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::{

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

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,

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};

crates/ide/src/syntax_highlighting.rs

@@ -18,7 +18,10 @@ use hir::{HirFileIdExt, InFile, InRealFile, MacroFileIdExt, MacroKind, Name, Sem
 use ide_db::{FxHashMap, 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::{

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()
                         }
                     }

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 {

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,

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 {