Skip to content

Commit b024c80

Browse files
committed
style: apply cargo fmt again after fixing clippy warnings.
1 parent a1dab88 commit b024c80

25 files changed

Lines changed: 331 additions & 299 deletions

File tree

cli/src/commands/mod.rs

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -355,13 +355,14 @@ impl Component for CompileState {
355355
let mut lines = Lines::new();
356356

357357
if mode == superconsole::DrawMode::Normal
358-
&& let Some(file) = &self.file_in_progress {
359-
lines.push(Line::from_iter([Span::new_unstyled(format!(
360-
"{} {}...",
361-
"Compiling".paint(Green).bold(),
362-
file.display(),
363-
))?]));
364-
}
358+
&& let Some(file) = &self.file_in_progress
359+
{
360+
lines.push(Line::from_iter([Span::new_unstyled(format!(
361+
"{} {}...",
362+
"Compiling".paint(Green).bold(),
363+
file.display(),
364+
))?]));
365+
}
365366

366367
Ok(lines)
367368
}

cli/src/commands/scan.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -758,9 +758,9 @@ mod output_handler {
758758
&& !matching_rule
759759
.tags()
760760
.any(|tag| tag.identifier() == only_tag)
761-
{
762-
continue;
763-
}
761+
{
762+
continue;
763+
}
764764

765765
result = true;
766766

cli/src/walk.rs

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,10 @@ impl<'a> Walker<'a> {
156156
} else {
157157
if metadata.is_file() {
158158
if self.pass_metadata_filter(metadata)
159-
&& let Err(err) = f(self.path) {
160-
return e(err);
161-
};
159+
&& let Err(err) = f(self.path)
160+
{
161+
return e(err);
162+
};
162163
return Ok(());
163164
}
164165
self.walk_dir(f, e)
@@ -185,9 +186,10 @@ impl<'a> Walker<'a> {
185186
},
186187
};
187188
if self.pass_metadata_filter(metadata)
188-
&& let Err(err) = f(&path) {
189-
e(err)?
190-
}
189+
&& let Err(err) = f(&path)
190+
{
191+
e(err)?
192+
}
191193
}
192194

193195
Ok(())
@@ -245,9 +247,10 @@ impl<'a> Walker<'a> {
245247
match entry.metadata() {
246248
Ok(metadata) => {
247249
if self.pass_metadata_filter(metadata)
248-
&& let Err(err) = f(entry.path()) {
249-
e(err)?
250-
}
250+
&& let Err(err) = f(entry.path())
251+
{
252+
e(err)?
253+
}
251254
}
252255
Err(err) => e(err.into())?,
253256
}
@@ -453,10 +456,11 @@ impl<'a> ParWalker<'a> {
453456
&mut per_thread_obj,
454457
);
455458
if let Err(err) = res
456-
&& error(err, &msg_send).is_err() {
457-
let _ = msg_send.send(Message::Abort);
458-
break;
459-
}
459+
&& error(err, &msg_send).is_err()
460+
{
461+
let _ = msg_send.send(Message::Abort);
462+
break;
463+
}
460464
}
461465
finalize(&per_thread_obj, &msg_send);
462466
}));
@@ -487,9 +491,10 @@ impl<'a> ParWalker<'a> {
487491
);
488492

489493
if let Err(err) = res
490-
&& error(err, &msg_send).is_err() {
491-
let _ = msg_send.send(Message::Abort);
492-
}
494+
&& error(err, &msg_send).is_err()
495+
{
496+
let _ = msg_send.send(Message::Abort);
497+
}
493498
}));
494499

495500
let mut console = if cfg!(feature = "logging") {
@@ -590,10 +595,11 @@ fn output_messages<S>(
590595
}
591596

592597
if let Some(console) = console.as_mut()
593-
&& Instant::elapsed(&last_render) > render_period {
594-
console.render(state.as_ref()).unwrap();
595-
last_render = Instant::now();
596-
}
598+
&& Instant::elapsed(&last_render) > render_period
599+
{
600+
console.render(state.as_ref()).unwrap();
601+
last_render = Instant::now();
602+
}
597603
}
598604
}
599605

fmt/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -918,7 +918,6 @@ impl Formatter {
918918
};
919919

920920
let tokens = AddIndentation::new(tokens, self.indentation);
921-
922921

923922
RemoveTrailingSpaces::new(tokens)
924923
}

fmt/src/processor/mod.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -412,9 +412,10 @@ where
412412
if let Token::Begin(rule) = token {
413413
self.stack.push(rule)
414414
} else if let Token::End(rule) = token
415-
&& let Some(top) = self.stack.pop() {
416-
assert_eq!(top, rule);
417-
}
415+
&& let Some(top) = self.stack.pop()
416+
{
417+
assert_eq!(top, rule);
418+
}
418419
self.output.push_back(token);
419420
} else {
420421
break;

lib/build.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,11 @@ fn generate_proto_code() {
180180
proto_parser.include(path);
181181
}
182182
if let Some(extension) = path.extension()
183-
&& extension == "proto" {
184-
proto_compiler.input(path);
185-
proto_parser.input(path);
186-
}
183+
&& extension == "proto"
184+
{
185+
proto_compiler.input(path);
186+
proto_parser.input(path);
187+
}
187188
}
188189

189190
// The environment variable `YRX_EXTRA_PROTOS` allows passing a list of

lib/src/compiler/emit.rs

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -399,9 +399,10 @@ fn emit_expr(
399399
// root structure, we know that the stack already
400400
// contains the object.
401401
if let Some((_, true)) = ctx.lookup_list.first()
402-
&& func.is_method() {
403-
emit_lookup_object(ctx, instr);
404-
}
402+
&& func.is_method()
403+
{
404+
emit_lookup_object(ctx, instr);
405+
}
405406
ctx.lookup_list.clear();
406407
}
407408
TypeValue::Regexp(_) => {
@@ -955,10 +956,11 @@ fn emit_field_access(
955956
// Rust code.
956957
for operand in field_access.operands.iter().dropping_back(1) {
957958
if let Expr::Symbol(symbol) = ir.get(*operand)
958-
&& let Symbol::Field { index, is_root, .. } = symbol.as_ref() {
959-
ctx.lookup_list.push((*index as i32, *is_root));
960-
continue;
961-
}
959+
&& let Symbol::Field { index, is_root, .. } = symbol.as_ref()
960+
{
961+
ctx.lookup_list.push((*index as i32, *is_root));
962+
continue;
963+
}
962964
emit_expr(ctx, ir, *operand, instr);
963965
}
964966

0 commit comments

Comments
 (0)