Skip to content

Commit 7a7ced4

Browse files
hongjr03hongjr03
committed
chore: fmt, clippy
1 parent 0c4e3ee commit 7a7ced4

14 files changed

Lines changed: 78 additions & 64 deletions

File tree

‎crates/hir-def/src/checker.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@ pub(crate) fn lower_checker_owner(
9191
return Arc::new(Lowered::new(file_id, body, source_map));
9292
};
9393

94-
let mut ctx = LoweringCtx::new_with_syntax(db,
94+
let mut ctx = LoweringCtx::new_with_syntax(
95+
db,
9596
owner,
9697
syntax,
9798
BodyStore { data: &mut body, sources: &mut source_map },

‎crates/hir-def/src/covergroup.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,8 @@ pub(crate) fn lower_covergroup_owner(
113113
return Arc::new(Lowered::new(file_id, body, source_map));
114114
};
115115

116-
let mut ctx = LoweringCtx::new_with_syntax(db,
116+
let mut ctx = LoweringCtx::new_with_syntax(
117+
db,
117118
owner,
118119
syntax,
119120
BodyStore { data: &mut body, sources: &mut source_map },

‎crates/hir-def/src/db.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
use std::ops::Deref;
22

3-
use utils::text_edit::TextSize;
4-
53
use base_db::salsa;
64
use preproc_expand::{db::PreprocDb, file::HirFileId};
75
use triomphe::Arc;
6+
use utils::text_edit::TextSize;
87

98
use crate::{
109
ast_id_map::{self, AstIdMap, SyntaxFileId},

‎crates/hir-def/src/design_map.rs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,11 @@ pub fn design_map(db: &dyn HirDefDb) -> Arc<DesignMap> {
249249
db.body(*package)
250250
.package_imports
251251
.values()
252-
.map(|import| Import { package: import.package.clone(), name: import.item.clone(), source: None })
252+
.map(|import| Import {
253+
package: import.package.clone(),
254+
name: import.item.clone(),
255+
source: None,
256+
})
253257
.collect::<Vec<_>>(),
254258
);
255259
}

‎crates/hir-def/src/diagnostics.rs‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,23 @@
1818
use la_arena::Arena;
1919
use smallvec::SmallVec;
2020
use smol_str::SmolStr;
21-
use syntax::SyntaxTree;
21+
use syntax::{SyntaxKind, SyntaxTree};
2222
use triomphe::Arc;
2323
use utils::{
2424
get::GetRef,
2525
text_edit::{TextRange, TextSize},
2626
};
2727

28-
use syntax::SyntaxKind;
29-
3028
use crate::{
31-
ast_id_map::SyntaxFileId, body::BodyItem, db::HirDefDb, has_source::HasSource, owner::OwnerId,
32-
proc::Proc, source_map::{LoweringDiagnostic, LoweringDiagnosticKind},
33-
source_projection::SourceProjection, symbol::NameContext,
29+
ast_id_map::SyntaxFileId,
30+
body::BodyItem,
31+
db::HirDefDb,
32+
has_source::HasSource,
33+
owner::OwnerId,
34+
proc::Proc,
35+
source_map::{LoweringDiagnostic, LoweringDiagnosticKind},
36+
source_projection::SourceProjection,
37+
symbol::NameContext,
3438
};
3539

3640
#[salsa::tracked(returns(clone))]
@@ -141,9 +145,9 @@ fn collect_import_conflicts(
141145
}
142146
reported.push(name.clone());
143147
let declared = scope.lookup(NameContext::Listing, &name).unique().is_some();
144-
let other_package = named.iter().any(|other| {
145-
other.name.as_ref() == Some(&name) && other.package != import.package
146-
});
148+
let other_package = named
149+
.iter()
150+
.any(|other| other.name.as_ref() == Some(&name) && other.package != import.package);
147151
let message = if declared {
148152
Some(format!(
149153
"explicit import of '{name}' conflicts with a declaration in the same scope"
@@ -160,7 +164,9 @@ fn collect_import_conflicts(
160164
let origin = projection.origin(source);
161165
diagnostics.push(LoweringDiagnostic {
162166
kind: LoweringDiagnosticKind::InvalidSyntax,
163-
syntax_kind: origin.and_then(|origin| origin.kind()).unwrap_or(SyntaxKind::PACKAGE_IMPORT_DECLARATION),
167+
syntax_kind: origin
168+
.and_then(|origin| origin.kind())
169+
.unwrap_or(SyntaxKind::PACKAGE_IMPORT_DECLARATION),
164170
source: Some(source),
165171
range: origin.and_then(|origin| origin.full_range()),
166172
message: message.into(),
@@ -442,9 +448,7 @@ endmodule
442448
let db = db_with_files(text, None);
443449
let diagnostics = db.file_lowering_diagnostics(HirFileId::File(TOP));
444450
assert!(
445-
diagnostics
446-
.iter()
447-
.any(|diag| diag.message.contains("another explicit import")),
451+
diagnostics.iter().any(|diag| diag.message.contains("another explicit import")),
448452
"explicit imports of one name from two packages must be diagnosed: {diagnostics:?}"
449453
);
450454
}
@@ -466,12 +470,11 @@ endmodule
466470
let db = db_with_files(text, None);
467471

468472
let diagnostics = db.file_lowering_diagnostics(HirFileId::File(TOP));
469-
let unsupported =
470-
diagnostics.iter().filter(|diag| diag.message == "unsupported statement").collect::<Vec<_>>();
471-
assert!(
472-
!unsupported.is_empty(),
473-
"foreach statement must be diagnosed: {diagnostics:?}"
474-
);
473+
let unsupported = diagnostics
474+
.iter()
475+
.filter(|diag| diag.message == "unsupported statement")
476+
.collect::<Vec<_>>();
477+
assert!(!unsupported.is_empty(), "foreach statement must be diagnosed: {diagnostics:?}");
475478
assert!(
476479
unsupported.iter().all(|diag| diag.source.is_some()),
477480
"unsupported statement diagnostics must retain a source identity"

‎crates/hir-def/src/expr.rs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -374,10 +374,9 @@ impl<Store: LoweringStore> LoweringCtx<Store> {
374374
let mut expr = match base {
375375
// `scope::member[sel]` keeps the scope receiver and applies
376376
// the selectors to the member field.
377-
Some(receiver) => Expr::Field {
378-
receiver,
379-
field: lower_ident_opt(ident_select.identifier()),
380-
},
377+
Some(receiver) => {
378+
Expr::Field { receiver, field: lower_ident_opt(ident_select.identifier()) }
379+
}
381380
None => {
382381
lower_ident_opt(ident_select.identifier()).map_or(Expr::Missing, Expr::Ident)
383382
}

‎crates/hir-def/src/file.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,9 @@ impl LowerFileCtx<'_> {
148148
None => continue,
149149
},
150150
PackageImportDeclaration(import_decl) => {
151-
for import in lower_package_imports(import_decl, self.source_id(import_decl.syntax())) {
151+
for import in
152+
lower_package_imports(import_decl, self.source_id(import_decl.syntax()))
153+
{
152154
self.store.data.package_imports.alloc(import);
153155
}
154156
continue;

‎crates/hir-def/src/module.rs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,9 @@ impl LowerModuleCtx<'_> {
199199

200200
// Imports
201201
PackageImportDeclaration(import_decl) => {
202-
for import in lower_package_imports(import_decl, self.source_id(import_decl.syntax())) {
202+
for import in
203+
lower_package_imports(import_decl, self.source_id(import_decl.syntax()))
204+
{
203205
self.store.data.package_imports.alloc(import);
204206
}
205207
continue;
@@ -443,7 +445,8 @@ pub(crate) fn lower_module_owner(
443445
};
444446
body.name = lower_ident_opt(ast_module.header().name());
445447

446-
let mut lower_ctx = LoweringCtx::new_with_syntax(db,
448+
let mut lower_ctx = LoweringCtx::new_with_syntax(
449+
db,
447450
owner,
448451
syntax,
449452
BodyStore { data: &mut body, sources: &mut source_map },

‎crates/hir-def/src/module/clocking.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,8 @@ pub(crate) fn lower_clocking_owner(
138138
return Arc::new(Lowered::new(file_id, body, source_map));
139139
};
140140

141-
let mut ctx = LoweringCtx::new_with_syntax(db,
141+
let mut ctx = LoweringCtx::new_with_syntax(
142+
db,
142143
owner,
143144
syntax,
144145
BodyStore { data: &mut body, sources: &mut source_map },

‎crates/hir-def/src/module/generate.rs‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,9 @@ impl LowerGenerateBlockCtx<'_> {
163163
}
164164
DefParam(defparam) => self.lower_defparam(defparam).into(),
165165
PackageImportDeclaration(import_decl) => {
166-
for import in lower_package_imports(import_decl, self.source_id(import_decl.syntax())) {
166+
for import in
167+
lower_package_imports(import_decl, self.source_id(import_decl.syntax()))
168+
{
167169
self.store.data.package_imports.alloc(import);
168170
}
169171
return None;
@@ -353,7 +355,9 @@ impl LowerModuleCtx<'_> {
353355
items.push(self.lower_defparam(defparam).into());
354356
}
355357
PackageImportDeclaration(import_decl) => {
356-
for import in lower_package_imports(import_decl, self.source_id(import_decl.syntax())) {
358+
for import in
359+
lower_package_imports(import_decl, self.source_id(import_decl.syntax()))
360+
{
357361
self.store.data.package_imports.alloc(import);
358362
}
359363
}
@@ -423,7 +427,8 @@ pub(crate) fn lower_generate_owner(
423427

424428
let mut body = Body::default();
425429
let mut source_map = BodySourceMap::default();
426-
let mut lower_ctx = LoweringCtx::new_with_syntax(db,
430+
let mut lower_ctx = LoweringCtx::new_with_syntax(
431+
db,
427432
owner,
428433
syntax,
429434
BodyStore { data: &mut body, sources: &mut source_map },

0 commit comments

Comments
 (0)