clippy

Author: davidbarsky

crates/hir-expand/src/change.rs

@@ -1,7 +1,7 @@
 //! Defines a unit of change that can applied to the database to get the next
 //! state. Changes are transactional.
 use base_db::{
-    CrateGraph, CrateId, CrateWorkspaceData, FileChange, RootQueryDb, SourceDatabase, SourceRoot,
+    CrateGraph, CrateId, CrateWorkspaceData, FileChange, SourceRoot,
 };
 use rustc_hash::FxHashMap;
 use salsa::Durability;
@@ -21,7 +21,7 @@ impl ChangeWithProcMacros {
         Self::default()
     }
 
-    pub fn apply(self, db: &mut (impl ExpandDatabase + SourceDatabase + RootQueryDb)) {
+    pub fn apply(self, db: &mut impl ExpandDatabase) {
         self.source_change.apply(db);
         if let Some(proc_macros) = self.proc_macros {
             db.set_proc_macros_with_durability(Arc::new(proc_macros), Durability::HIGH);

crates/hir-expand/src/hygiene.rs

@@ -226,7 +226,7 @@ pub(crate) fn dump_syntax_contexts(db: &dyn ExpandDatabase) -> String {
 
         impl std::fmt::Debug for SyntaxContextDebug<'_> {
             fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                fancy_debug(&self.1, self.0, f)
+                fancy_debug(self.1, self.0, f)
             }
         }
 

crates/hir/src/semantics/source_to_def.rs

@@ -179,7 +179,7 @@ impl SourceToDefCtx<'_, '_> {
             let mut mods = SmallVec::new();
 
             for &crate_id in
-                Upcast::<dyn RootQueryDb>::upcast(self.db).relevant_crates(file.into()).iter()
+                Upcast::<dyn RootQueryDb>::upcast(self.db).relevant_crates(file).iter()
             {
                 // Note: `mod` declarations in block modules cannot be supported here
                 let crate_def_map = self.db.crate_def_map(crate_id);

crates/ide-diagnostics/src/lib.rs

@@ -339,7 +339,7 @@ pub fn syntax_diagnostics(
             Diagnostic::new(
                 DiagnosticCode::SyntaxError,
                 format!("Syntax Error: {err}"),
-                FileRange { file_id: file_id.into(), range: err.range() },
+                FileRange { file_id, range: err.range() },
             )
         })
         .collect()

crates/rust-analyzer/src/cli/run_tests.rs

@@ -40,7 +40,7 @@ impl flags::RunTests {
                 None => " (unknown line col)".to_owned(),
                 Some(x) => format!("#{}:{}", x.line + 1, x.col),
             };
-            let source_root = db.file_source_root(file_id.into()).source_root_id(db);
+            let source_root = db.file_source_root(file_id).source_root_id(db);
             let source_root = db.source_root(source_root).source_root(db);
 
             let path = source_root.path_for_file(&file_id).map(|x| x.to_string());

crates/rust-analyzer/src/handlers/request.rs

@@ -1319,7 +1319,7 @@ pub(crate) fn handle_rename(
     {
         for op in ops {
             if let lsp_types::DocumentChangeOperation::Op(doc_change_op) = op {
-                resource_ops_supported(&snap.config, resolve_resource_op(&doc_change_op))?
+                resource_ops_supported(&snap.config, resolve_resource_op(doc_change_op))?
             }
         }
     }
@@ -1442,7 +1442,7 @@ pub(crate) fn handle_code_action(
         if let Some(changes) = changes {
             for change in changes {
                 if let lsp_ext::SnippetDocumentChangeOperation::Op(res_op) = change {
-                    resource_ops_supported(&snap.config, resolve_resource_op(&res_op))?
+                    resource_ops_supported(&snap.config, resolve_resource_op(res_op))?
                 }
             }
         }

crates/span/src/hygiene.rs

@@ -187,7 +187,7 @@ const _: () = {
                     outer_transparency,
                     edition,
                     parent,
-                    std::marker::PhantomData::default(),
+                    std::marker::PhantomData,
                 ),
                 |id, data| SyntaxContextUnderlyingData {
                     outer_expn: zalsa_::interned::Lookup::into_owned(data.0),