diff options
Diffstat (limited to 'xtask')
-rw-r--r-- | xtask/src/codegen.rs | 2 | ||||
-rw-r--r-- | xtask/src/flags.rs | 2 | ||||
-rw-r--r-- | xtask/src/main.rs | 22 |
3 files changed, 2 insertions, 24 deletions
diff --git a/xtask/src/codegen.rs b/xtask/src/codegen.rs index 2cf3c6fdc..518e17e38 100644 --- a/xtask/src/codegen.rs +++ b/xtask/src/codegen.rs | |||
@@ -62,7 +62,7 @@ pub(crate) fn ensure_file_contents(file: &Path, contents: &str) -> Result<()> { | |||
62 | let _ = std::fs::create_dir_all(parent); | 62 | let _ = std::fs::create_dir_all(parent); |
63 | } | 63 | } |
64 | std::fs::write(file, contents).unwrap(); | 64 | std::fs::write(file, contents).unwrap(); |
65 | anyhow::bail!("some file were not up to date") | 65 | anyhow::bail!("some file was not up to date and has been updated, simply re-run the tests") |
66 | } | 66 | } |
67 | 67 | ||
68 | fn normalize_newlines(s: &str) -> String { | 68 | fn normalize_newlines(s: &str) -> String { |
diff --git a/xtask/src/flags.rs b/xtask/src/flags.rs index 48d1ad45e..4cd2b1ddb 100644 --- a/xtask/src/flags.rs +++ b/xtask/src/flags.rs | |||
@@ -27,7 +27,6 @@ xflags::xflags! { | |||
27 | optional --jemalloc | 27 | optional --jemalloc |
28 | } | 28 | } |
29 | 29 | ||
30 | cmd lint {} | ||
31 | cmd fuzz-tests {} | 30 | cmd fuzz-tests {} |
32 | cmd pre-cache {} | 31 | cmd pre-cache {} |
33 | 32 | ||
@@ -63,7 +62,6 @@ pub struct Xtask { | |||
63 | pub enum XtaskCmd { | 62 | pub enum XtaskCmd { |
64 | Help(Help), | 63 | Help(Help), |
65 | Install(Install), | 64 | Install(Install), |
66 | Lint(Lint), | ||
67 | FuzzTests(FuzzTests), | 65 | FuzzTests(FuzzTests), |
68 | PreCache(PreCache), | 66 | PreCache(PreCache), |
69 | Release(Release), | 67 | Release(Release), |
diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 35cc7c108..915aae71a 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs | |||
@@ -1,7 +1,7 @@ | |||
1 | //! See https://github.com/matklad/cargo-xtask/. | 1 | //! See https://github.com/matklad/cargo-xtask/. |
2 | //! | 2 | //! |
3 | //! This binary defines various auxiliary build commands, which are not | 3 | //! This binary defines various auxiliary build commands, which are not |
4 | //! expressible with just `cargo`. Notably, it provides `cargo xtask codegen` | 4 | //! expressible with just `cargo`. Notably, it provides tests via `cargo test -p xtask` |
5 | //! for code generation and `cargo xtask install` for installation of | 5 | //! for code generation and `cargo xtask install` for installation of |
6 | //! rust-analyzer server and client. | 6 | //! rust-analyzer server and client. |
7 | //! | 7 | //! |
@@ -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 | ||
98 | fn 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 | |||
117 | fn run_fuzzer() -> Result<()> { | 97 | fn 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"); |