Skip to content

Commit b0e8be2

Browse files
authored
fix: run clippy and rustfmt; fix issues (#34)
1 parent 2593e1e commit b0e8be2

File tree

6 files changed

+17
-14
lines changed

6 files changed

+17
-14
lines changed

src/git.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ pub fn get_head() -> Result<String> {
1818
pub fn get_paths_from_cmd(paths_cmd: &str) -> Result<Vec<AbsPath>> {
1919
debug!("Running paths_cmd: {}", paths_cmd);
2020
if paths_cmd.is_empty() {
21-
return Err(anyhow::Error::msg("paths_cmd is empty. Please provide an executable command."));
21+
return Err(anyhow::Error::msg(
22+
"paths_cmd is empty. Please provide an executable command.",
23+
));
2224
}
2325
let argv = shell_words::split(paths_cmd).context("failed to split paths_cmd")?;
2426
debug!("Parsed paths_cmd: {:?}", argv);

src/lint_config.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,7 @@ pub fn get_linters_from_config(
173173
);
174174
}
175175

176-
linters = linters
177-
.into_iter()
178-
.filter(|linter| taken_linters.contains(&linter.code))
179-
.collect();
176+
linters.retain(|linter| taken_linters.contains(&linter.code));
180177
}
181178

182179
// Apply --skip
@@ -190,10 +187,7 @@ pub fn get_linters_from_config(
190187
all_linters,
191188
);
192189
}
193-
linters = linters
194-
.into_iter()
195-
.filter(|linter| !skipped_linters.contains(&linter.code))
196-
.collect();
190+
linters.retain(|linter| !skipped_linters.contains(&linter.code));
197191
}
198192
Ok(linters)
199193
}

src/linter.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ impl Linter {
160160
original: None,
161161
replacement: None,
162162
};
163-
return vec![err_lint];
163+
vec![err_lint]
164164
}
165165
Ok(messages) => messages,
166166
}

src/main.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,19 @@ use clap::Parser;
66

77
use lintrunner::{
88
do_init, do_lint,
9+
git::get_head,
910
init::check_init_changed,
1011
lint_config::{get_linters_from_config, LintRunnerConfig},
1112
log_utils::setup_logger,
1213
path::AbsPath,
1314
persistent_data::{ExitInfo, PersistentDataStore, RunInfo},
1415
rage::do_rage,
1516
render::print_error,
16-
PathsOpt, RenderOpt, RevisionOpt, git::get_head,
17+
PathsOpt, RenderOpt, RevisionOpt,
1718
};
1819
use log::debug;
1920

20-
const VERSION: &'static str = env!("CARGO_PKG_VERSION");
21+
const VERSION: &str = env!("CARGO_PKG_VERSION");
2122

2223
#[derive(Debug, Parser)]
2324
#[clap(version, name = "lintrunner", infer_subcommands(true))]

src/persistent_data.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ impl RunInfo {
4747
// this run.
4848
fn dir_name(&self) -> String {
4949
let args = blake3::hash(self.args.join("_").as_bytes()).to_string();
50-
self.timestamp.clone().replace(":", "-").replace("+", "_") + "_" + &args
50+
self.timestamp.clone().replace(':', "-").replace('+', "_") + "_" + &args
5151
}
5252
}
5353

src/render.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,13 @@ pub fn render_lint_messages_oneline(
5454
writeln!(
5555
stdout,
5656
"{}:{}:{} :{} {} [{}/{}]",
57-
display_path, line_number, column, severity, description, lint_message.code, lint_message.name
57+
display_path,
58+
line_number,
59+
column,
60+
severity,
61+
description,
62+
lint_message.code,
63+
lint_message.name
5864
)?;
5965
}
6066

0 commit comments

Comments
 (0)