diff --git a/crates/hir-def/src/resolver.rs b/crates/hir-def/src/resolver.rs index bf5f908403e1..f4773de08555 100644 --- a/crates/hir-def/src/resolver.rs +++ b/crates/hir-def/src/resolver.rs @@ -911,7 +911,7 @@ fn hygiene_info( ) -> Option<(SyntaxContextId, MacroDefId)> { if !hygiene_id.is_root() { let ctx = hygiene_id.lookup(); - ctx.outer_expn(db).map(|expansion|{ + ctx.outer_expn(db).map(|expansion| { let expansion = db.lookup_intern_macro_call(expansion); (ctx.parent(db), expansion.def) }) diff --git a/crates/hir-expand/src/change.rs b/crates/hir-expand/src/change.rs index c7f834450532..7a42d6626010 100644 --- a/crates/hir-expand/src/change.rs +++ b/crates/hir-expand/src/change.rs @@ -1,8 +1,6 @@ //! 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, SourceRoot, -}; +use base_db::{CrateGraph, CrateId, CrateWorkspaceData, FileChange, SourceRoot}; use rustc_hash::FxHashMap; use salsa::Durability; use span::FileId; diff --git a/crates/hir-ty/src/consteval.rs b/crates/hir-ty/src/consteval.rs index b7745ca7666e..b3c604015a0c 100644 --- a/crates/hir-ty/src/consteval.rs +++ b/crates/hir-ty/src/consteval.rs @@ -16,10 +16,14 @@ use stdx::never; use triomphe::Arc; use crate::{ - db::{HirDatabase, HirDatabaseData}, display::DisplayTarget, generics::Generics, infer::InferenceContext, - lower::ParamLoweringMode, mir::monomorphize_mir_body_bad, to_placeholder_idx, Const, ConstData, - ConstScalar, ConstValue, GenericArg, Interner, MemoryMap, Substitution, TraitEnvironment, Ty, - TyBuilder, + db::{HirDatabase, HirDatabaseData}, + display::DisplayTarget, + generics::Generics, + infer::InferenceContext, + lower::ParamLoweringMode, + mir::monomorphize_mir_body_bad, + to_placeholder_idx, Const, ConstData, ConstScalar, ConstValue, GenericArg, Interner, MemoryMap, + Substitution, TraitEnvironment, Ty, TyBuilder, }; use super::mir::{interpret_mir, lower_to_mir, pad16, MirEvalError, MirLowerError}; diff --git a/crates/hir-ty/src/db.rs b/crates/hir-ty/src/db.rs index 333ed388bf08..5817ed2ef20c 100644 --- a/crates/hir-ty/src/db.rs +++ b/crates/hir-ty/src/db.rs @@ -170,9 +170,7 @@ pub trait HirDatabase: DefDatabase + Upcast + std::fmt::Debug { #[salsa::invoke_actual(crate::lower::generic_predicates_query)] fn generic_predicates(&self, def: GenericDefId) -> GenericPredicates; - #[salsa::invoke_actual( - crate::lower::generic_predicates_without_parent_with_diagnostics_query - )] + #[salsa::invoke_actual(crate::lower::generic_predicates_without_parent_with_diagnostics_query)] fn generic_predicates_without_parent_with_diagnostics( &self, def: GenericDefId, diff --git a/crates/hir/src/semantics/source_to_def.rs b/crates/hir/src/semantics/source_to_def.rs index 40cd241acfb4..4ec073965607 100644 --- a/crates/hir/src/semantics/source_to_def.rs +++ b/crates/hir/src/semantics/source_to_def.rs @@ -178,8 +178,7 @@ impl SourceToDefCtx<'_, '_> { self.cache.file_to_def_cache.entry(file).or_insert_with(|| { let mut mods = SmallVec::new(); - for &crate_id in - Upcast::::upcast(self.db).relevant_crates(file).iter() + for &crate_id in Upcast::::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); diff --git a/crates/ide-diagnostics/src/lib.rs b/crates/ide-diagnostics/src/lib.rs index c59c8455e734..5ce3336eb41f 100644 --- a/crates/ide-diagnostics/src/lib.rs +++ b/crates/ide-diagnostics/src/lib.rs @@ -393,14 +393,7 @@ pub fn semantic_diagnostics( (*db.crate_graph().crates_in_topological_order().last().unwrap()).into() }); let display_target = krate.to_display_target(db); - let ctx = DiagnosticsContext { - config, - sema, - resolve, - edition, - is_nightly, - display_target, - }; + let ctx = DiagnosticsContext { config, sema, resolve, edition, is_nightly, display_target }; let mut diags = Vec::new(); match module { diff --git a/crates/ide/src/static_index.rs b/crates/ide/src/static_index.rs index 7af1433aed5b..ceea34b72137 100644 --- a/crates/ide/src/static_index.rs +++ b/crates/ide/src/static_index.rs @@ -3,7 +3,7 @@ use hir::{db::HirDatabase, Crate, HirFileIdExt, Module, Semantics}; use ide_db::{ - base_db::{SourceDatabase, RootQueryDb, VfsPath}, + base_db::{RootQueryDb, SourceDatabase, VfsPath}, defs::Definition, documentation::Documentation, famous_defs::FamousDefs, diff --git a/crates/ide/src/typing.rs b/crates/ide/src/typing.rs index 1e30f1ed1023..f583aa801eaa 100644 --- a/crates/ide/src/typing.rs +++ b/crates/ide/src/typing.rs @@ -78,7 +78,7 @@ pub(crate) fn on_char_typed( let edition = Edition::CURRENT_FIXME; let editioned_file_id_wrapper = ide_db::base_db::EditionedFileId::new( db.as_dyn_database(), - EditionedFileId::new(position.file_id, edition) + EditionedFileId::new(position.file_id, edition), ); let file = &db.parse(editioned_file_id_wrapper); let char_matches_position =