aboutsummaryrefslogtreecommitdiff
path: root/xtask/src/main.rs
diff options
context:
space:
mode:
authorMatthias Krüger <[email protected]>2021-03-14 12:34:28 +0000
committerMatthias Krüger <[email protected]>2021-03-14 12:36:45 +0000
commit5008e5682159965c6f3b174aed3523c0b5e2fc08 (patch)
tree717c195e1ea7894c25d62cdab0b6c4526585eba1 /xtask/src/main.rs
parenta8a7fa834726eb763fe872b02db821f99098a498 (diff)
xtask: replace "lint" command by a simply cargo alias
This strips the run_clippy implementation out of xtask and replaces it by a simple "cargo lint" alias which runs clippy with the corresponding flags. Unfortunately I could not name the alias "clippy" because that would lead to infinite recursion.
Diffstat (limited to 'xtask/src/main.rs')
-rw-r--r--xtask/src/main.rs20
1 files changed, 0 insertions, 20 deletions
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index 057cd57ae..915aae71a 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -40,7 +40,6 @@ fn main() -> Result<()> {
40 return Ok(()); 40 return Ok(());
41 } 41 }
42 flags::XtaskCmd::Install(cmd) => cmd.run(), 42 flags::XtaskCmd::Install(cmd) => cmd.run(),
43 flags::XtaskCmd::Lint(_) => run_clippy(),
44 flags::XtaskCmd::FuzzTests(_) => run_fuzzer(), 43 flags::XtaskCmd::FuzzTests(_) => run_fuzzer(),
45 flags::XtaskCmd::PreCache(cmd) => cmd.run(), 44 flags::XtaskCmd::PreCache(cmd) => cmd.run(),
46 flags::XtaskCmd::Release(cmd) => cmd.run(), 45 flags::XtaskCmd::Release(cmd) => cmd.run(),
@@ -95,25 +94,6 @@ fn ensure_rustfmt() -> Result<()> {
95 Ok(()) 94 Ok(())
96} 95}
97 96
98fn run_clippy() -> Result<()> {
99 if cmd!("cargo clippy --version").read().is_err() {
100 bail!(
101 "Failed run cargo clippy. \
102 Please run `rustup component add clippy` to install it.",
103 )
104 }
105
106 let allowed_lints = "
107 -A clippy::collapsible_if
108 -A clippy::needless_pass_by_value
109 -A clippy::nonminimal_bool
110 -A clippy::redundant_pattern_matching
111 "
112 .split_ascii_whitespace();
113 cmd!("cargo clippy --all-features --all-targets -- {allowed_lints...}").run()?;
114 Ok(())
115}
116
117fn run_fuzzer() -> Result<()> { 97fn run_fuzzer() -> Result<()> {
118 let _d = pushd("./crates/syntax")?; 98 let _d = pushd("./crates/syntax")?;
119 let _e = pushenv("RUSTUP_TOOLCHAIN", "nightly"); 99 let _e = pushenv("RUSTUP_TOOLCHAIN", "nightly");