4 files changed, 4 insertions, 25 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<()> {
         let _ = std::fs::create_dir_all(parent);
     }
     std::fs::write(file, contents).unwrap();
-    anyhow::bail!("some file were not up to date")
+    anyhow::bail!("some file was not up to date and has been updated, simply re-run the tests")
 }
 
 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! {
             optional --jemalloc
         }
 
-        cmd lint {}
         cmd fuzz-tests {}
         cmd pre-cache {}
 
@@ -63,7 +62,6 @@ pub struct Xtask {
 pub enum XtaskCmd {
     Help(Help),
     Install(Install),
-    Lint(Lint),
     FuzzTests(FuzzTests),
     PreCache(PreCache),
     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 @@
 //! See https://github.com/matklad/cargo-xtask/.
 //!
 //! This binary defines various auxiliary build commands, which are not
-//! expressible with just `cargo`. Notably, it provides `cargo xtask codegen`
+//! expressible with just `cargo`. Notably, it provides tests via `cargo test -p xtask`
 //! for code generation and `cargo xtask install` for installation of
 //! rust-analyzer server and client.
 //!
@@ -40,7 +40,6 @@ fn main() -> Result<()> {
             return Ok(());
         }
         flags::XtaskCmd::Install(cmd) => cmd.run(),
-        flags::XtaskCmd::Lint(_) => run_clippy(),
         flags::XtaskCmd::FuzzTests(_) => run_fuzzer(),
         flags::XtaskCmd::PreCache(cmd) => cmd.run(),
         flags::XtaskCmd::Release(cmd) => cmd.run(),
@@ -95,25 +94,6 @@ fn ensure_rustfmt() -> Result<()> {
     Ok(())
 }
 
-fn run_clippy() -> Result<()> {
-    if cmd!("cargo clippy --version").read().is_err() {
-        bail!(
-            "Failed run cargo clippy. \
-            Please run `rustup component add clippy` to install it.",
-        )
-    }
-
-    let allowed_lints = "
-        -A clippy::collapsible_if
-        -A clippy::needless_pass_by_value
-        -A clippy::nonminimal_bool
-        -A clippy::redundant_pattern_matching
-    "
-    .split_ascii_whitespace();
-    cmd!("cargo clippy --all-features --all-targets -- {allowed_lints...}").run()?;
-    Ok(())
-}
-
 fn run_fuzzer() -> Result<()> {
     let _d = pushd("./crates/syntax")?;
     let _e = pushenv("RUSTUP_TOOLCHAIN", "nightly");
diff --git a/xtask/src/metrics.rs b/xtask/src/metrics.rs
index 72de92c64..3d8d7589b 100644
--- a/xtask/src/metrics.rs
+++ b/xtask/src/metrics.rs
@@ -26,7 +26,7 @@ impl flags::Metrics {
         }
         {
             let _d = pushd("./target/rustc-perf")?;
-            cmd!("git reset --hard 1d9288b0da7febf2599917da1b57dc241a1af033").run()?;
+            cmd!("git reset --hard c52ee623e231e7690a93be88d943016968c1036b").run()?;
         }
 
         let _env = pushenv("RA_METRICS", "1");
@@ -35,6 +35,7 @@ impl flags::Metrics {
         metrics.measure_analysis_stats_self()?;
         metrics.measure_analysis_stats("ripgrep")?;
         metrics.measure_analysis_stats("webrender")?;
+        metrics.measure_analysis_stats("diesel/diesel")?;
 
         if !self.dry_run {
             let _d = pushd("target")?;