Skip to content

Commit 674bc30

Browse files
committed
style: run cargo fmt.
1 parent 27a3b2f commit 674bc30

4 files changed

Lines changed: 16 additions & 18 deletions

File tree

cli/src/commands/check.rs

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ use std::path::PathBuf;
22
use std::sync::atomic::{AtomicUsize, Ordering};
33
use std::{fs, io, process};
44

5+
use crate::walk::StateComponent;
56
use anyhow::Context;
67
use clap::{ArgAction, ArgMatches, Command, arg, value_parser};
78
use crossterm::tty::IsTty;
8-
use crate::walk::StateComponent;
99
use yansi::Color::{Green, Red, Yellow};
1010
use yansi::Paint;
1111
use yara_x::{SourceCode, linters};
@@ -310,15 +310,11 @@ impl StateComponent for CheckState {
310310
self.files_passed.load(Ordering::Relaxed)
311311
);
312312

313-
let warnings = format!(
314-
"warnings: {}. ",
315-
self.warnings.load(Ordering::Relaxed)
316-
);
313+
let warnings =
314+
format!("warnings: {}. ", self.warnings.load(Ordering::Relaxed));
317315

318-
let errors = format!(
319-
"errors: {}.",
320-
self.errors.load(Ordering::Relaxed)
321-
);
316+
let errors =
317+
format!("errors: {}.", self.errors.load(Ordering::Relaxed));
322318

323319
format!(
324320
"{}{}{}",

cli/src/commands/fix.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ use std::io::Write;
77
use std::path::PathBuf;
88
use std::sync::atomic::{AtomicUsize, Ordering};
99

10+
use crate::walk::StateComponent;
1011
use anyhow::Context;
1112
use clap::{Arg, ArgAction, ArgMatches, Command, arg, value_parser};
12-
use crate::walk::StateComponent;
1313
use yansi::Color::{Green, Red, Yellow};
1414
use yansi::Paint;
1515
use yara_x::Patch;

cli/src/commands/mod.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ use std::fs;
2424
use std::io::stdout;
2525
use std::path::PathBuf;
2626

27+
use crate::walk::StateComponent;
2728
use anyhow::{Context, anyhow, bail};
2829
use clap::{
2930
Arg, ArgAction, ArgMatches, Command, arg, command, crate_authors,
3031
value_parser,
3132
};
3233
use crossterm::tty::IsTty;
33-
use crate::walk::StateComponent;
3434
use indicatif::{ProgressBar, ProgressStyle};
3535
use unicode_width::{UnicodeWidthChar, UnicodeWidthStr};
3636
use yansi::Color::Green;
@@ -260,7 +260,9 @@ where
260260

261261
let mut pb = if stdout().is_tty() {
262262
let pb = ProgressBar::new_spinner();
263-
pb.set_style(ProgressStyle::default_spinner().template("{msg}").unwrap());
263+
pb.set_style(
264+
ProgressStyle::default_spinner().template("{msg}").unwrap(),
265+
);
264266
Some(pb)
265267
} else {
266268
None
@@ -286,7 +288,9 @@ where
286288
state.file_in_progress = Some(file_path.into());
287289

288290
if let Some(pb) = pb.as_mut() {
289-
let width = crossterm::terminal::size().map(|(w, _)| w as usize).unwrap_or(80);
291+
let width = crossterm::terminal::size()
292+
.map(|(w, _)| w as usize)
293+
.unwrap_or(80);
290294
pb.set_message(state.draw(width));
291295
}
292296

cli/src/commands/scan.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ use std::sync::Mutex;
66
use std::sync::atomic::{AtomicUsize, Ordering};
77
use std::time::{Duration, Instant};
88

9+
use crate::walk::StateComponent;
910
use anyhow::{Context, Error, bail};
1011
use clap::{
1112
Arg, ArgAction, ArgMatches, Command, ValueEnum, arg, value_parser,
1213
};
1314
use crossbeam::channel::Sender;
1415
use itertools::Itertools;
15-
use crate::walk::StateComponent;
1616
use yansi::Color::{Cyan, Green, Red, Yellow};
1717
use yansi::Paint;
1818

@@ -543,8 +543,7 @@ impl StateComponent for ScanState {
543543
output.push_str(&"╶".repeat(width));
544544
output.push('\n');
545545

546-
for (file, start_time) in
547-
self.files_in_progress.lock().unwrap().iter()
546+
for (file, start_time) in self.files_in_progress.lock().unwrap().iter()
548547
{
549548
let max_path_with = width.saturating_sub(7);
550549

@@ -553,8 +552,7 @@ impl StateComponent for ScanState {
553552
max_path_with,
554553
);
555554

556-
let spaces =
557-
" ".repeat(max_path_with.saturating_sub(path_width));
555+
let spaces = " ".repeat(max_path_with.saturating_sub(path_width));
558556

559557
let line = format!(
560558
"{}{}{:6.1}s",

0 commit comments

Comments
 (0)