Skip to content

Commit f956b77

Browse files
committed
fmt
1 parent e14f9d2 commit f956b77

File tree

8 files changed

+15
-23
lines changed

8 files changed

+15
-23
lines changed

crates/hir-def/src/resolver.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,7 @@ fn hygiene_info(
911911
) -> Option<(SyntaxContextId, MacroDefId)> {
912912
if !hygiene_id.is_root() {
913913
let ctx = hygiene_id.lookup();
914-
ctx.outer_expn(db).map(|expansion|{
914+
ctx.outer_expn(db).map(|expansion| {
915915
let expansion = db.lookup_intern_macro_call(expansion);
916916
(ctx.parent(db), expansion.def)
917917
})

crates/hir-expand/src/change.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
//! Defines a unit of change that can applied to the database to get the next
22
//! state. Changes are transactional.
3-
use base_db::{
4-
CrateGraph, CrateId, CrateWorkspaceData, FileChange, SourceRoot,
5-
};
3+
use base_db::{CrateGraph, CrateId, CrateWorkspaceData, FileChange, SourceRoot};
64
use rustc_hash::FxHashMap;
75
use salsa::Durability;
86
use span::FileId;

crates/hir-ty/src/consteval.rs

+8-4
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,14 @@ use stdx::never;
1616
use triomphe::Arc;
1717

1818
use crate::{
19-
db::{HirDatabase, HirDatabaseData}, display::DisplayTarget, generics::Generics, infer::InferenceContext,
20-
lower::ParamLoweringMode, mir::monomorphize_mir_body_bad, to_placeholder_idx, Const, ConstData,
21-
ConstScalar, ConstValue, GenericArg, Interner, MemoryMap, Substitution, TraitEnvironment, Ty,
22-
TyBuilder,
19+
db::{HirDatabase, HirDatabaseData},
20+
display::DisplayTarget,
21+
generics::Generics,
22+
infer::InferenceContext,
23+
lower::ParamLoweringMode,
24+
mir::monomorphize_mir_body_bad,
25+
to_placeholder_idx, Const, ConstData, ConstScalar, ConstValue, GenericArg, Interner, MemoryMap,
26+
Substitution, TraitEnvironment, Ty, TyBuilder,
2327
};
2428

2529
use super::mir::{interpret_mir, lower_to_mir, pad16, MirEvalError, MirLowerError};

crates/hir-ty/src/db.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,7 @@ pub trait HirDatabase: DefDatabase + Upcast<dyn DefDatabase> + std::fmt::Debug {
170170
#[salsa::invoke_actual(crate::lower::generic_predicates_query)]
171171
fn generic_predicates(&self, def: GenericDefId) -> GenericPredicates;
172172

173-
#[salsa::invoke_actual(
174-
crate::lower::generic_predicates_without_parent_with_diagnostics_query
175-
)]
173+
#[salsa::invoke_actual(crate::lower::generic_predicates_without_parent_with_diagnostics_query)]
176174
fn generic_predicates_without_parent_with_diagnostics(
177175
&self,
178176
def: GenericDefId,

crates/hir/src/semantics/source_to_def.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,7 @@ impl SourceToDefCtx<'_, '_> {
178178
self.cache.file_to_def_cache.entry(file).or_insert_with(|| {
179179
let mut mods = SmallVec::new();
180180

181-
for &crate_id in
182-
Upcast::<dyn RootQueryDb>::upcast(self.db).relevant_crates(file).iter()
181+
for &crate_id in Upcast::<dyn RootQueryDb>::upcast(self.db).relevant_crates(file).iter()
183182
{
184183
// Note: `mod` declarations in block modules cannot be supported here
185184
let crate_def_map = self.db.crate_def_map(crate_id);

crates/ide-diagnostics/src/lib.rs

+1-8
Original file line numberDiff line numberDiff line change
@@ -393,14 +393,7 @@ pub fn semantic_diagnostics(
393393
(*db.crate_graph().crates_in_topological_order().last().unwrap()).into()
394394
});
395395
let display_target = krate.to_display_target(db);
396-
let ctx = DiagnosticsContext {
397-
config,
398-
sema,
399-
resolve,
400-
edition,
401-
is_nightly,
402-
display_target,
403-
};
396+
let ctx = DiagnosticsContext { config, sema, resolve, edition, is_nightly, display_target };
404397

405398
let mut diags = Vec::new();
406399
match module {

crates/ide/src/static_index.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
use hir::{db::HirDatabase, Crate, HirFileIdExt, Module, Semantics};
55
use ide_db::{
6-
base_db::{SourceDatabase, RootQueryDb, VfsPath},
6+
base_db::{RootQueryDb, SourceDatabase, VfsPath},
77
defs::Definition,
88
documentation::Documentation,
99
famous_defs::FamousDefs,

crates/ide/src/typing.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ pub(crate) fn on_char_typed(
7878
let edition = Edition::CURRENT_FIXME;
7979
let editioned_file_id_wrapper = ide_db::base_db::EditionedFileId::new(
8080
db.as_dyn_database(),
81-
EditionedFileId::new(position.file_id, edition)
81+
EditionedFileId::new(position.file_id, edition),
8282
);
8383
let file = &db.parse(editioned_file_id_wrapper);
8484
let char_matches_position =

0 commit comments

Comments
 (0)