From c61722f83ffc8d7f81477d886c51ac71ff557586 Mon Sep 17 00:00:00 2001
From: Dan Gohman <sunfish@mozilla.com>
Date: Sun, 30 Sep 2018 15:34:14 -0700
Subject: [PATCH] Remove obsolete clippy scripts.

Now that clippy is installable via rustup and is generally more stable,
we no longer need special scripts. `rustup component add clippy-preview` is
sufficient to install clippy, and `cargo clippy` is sufficient to run it.

Also, don't run clippy in test-all.sh. We do generally want to fix things
clippy reports, however it's not a requirement that the code be kept
clippy-warning-free at all times.
---
 check-clippy.sh       | 10 ----------
 clippy-all.sh         |  7 -------
 cranelift/test-all.sh | 10 +---------
 3 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100755 check-clippy.sh
 delete mode 100755 clippy-all.sh

diff --git a/check-clippy.sh b/check-clippy.sh
deleted file mode 100755
index 072069cb9b..0000000000
--- a/check-clippy.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-# Usage: check-clippy.sh
-
-if cargo install --list | tee /dev/null | grep -q "^clippy v0"; then
-    exit 0
-else
-    exit 1
-fi
diff --git a/clippy-all.sh b/clippy-all.sh
deleted file mode 100755
index ba840b1d00..0000000000
--- a/clippy-all.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-# Check all sources with clippy.
-# In the clif-util crate (root dir) clippy will only work with nightly cargo -
-# there is a bug where it will reject the commands passed to it by cargo 0.25.0
-exec cargo +nightly clippy --all
diff --git a/cranelift/test-all.sh b/cranelift/test-all.sh
index 83db4528ec..46a985a4e7 100755
--- a/cranelift/test-all.sh
+++ b/cranelift/test-all.sh
@@ -9,7 +9,7 @@ set -euo pipefail
 # - Make a release build.
 # - Run unit tests for all Rust crates (including the filetests)
 # - Build API documentation.
-# - Optionally, run clippy and fuzzing.
+# - Optionally, run fuzzing.
 #
 # All tests run by this script should be passing at all times.
 
@@ -70,14 +70,6 @@ cargo test --all
 banner "Rust documentation: $topdir/target/doc/cranelift/index.html"
 cargo doc
 
-# Run clippy if we have it.
-banner "Rust linter"
-if "$topdir/check-clippy.sh"; then
-    "$topdir/clippy-all.sh"
-else
-    echo "\`cargo +nightly install clippy\` for optional rust linting"
-fi
-
 # Ensure fuzzer works by running it with a single input
 # Note LSAN is disabled due to https://github.com/google/sanitizers/issues/764
 banner "cargo fuzz check"