Auto merge of #47881 - oli-obk:miri_clippy, r=Manishearth

Update clippy and miri submodule r? @Manishearth cc @kennytm I needed to touch the miri submodule's Cargo.toml to make sure that clippy gets the newest compiletest_rs. This will not fix miri, but since I touched the miri submodule, will this PR fail? miri is unfixable until #46882 is merged
rust-lang · Feb 5, 2018 · 6c04c41 · 6c04c41
2 parents b0a396b + 70717f2
commit 6c04c41
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/src/Cargo.lock b/src/Cargo.lock
diff --git a/src/ci/docker/x86_64-gnu-tools/checktools.sh b/src/ci/docker/x86_64-gnu-tools/checktools.sh
@@ -32,7 +32,7 @@ cat "$TOOLSTATE_FILE"
 
 # If this PR is intended to update one of these tools, do not let the build pass
 # when they do not test-pass.
-for TOOL in rls rustfmt miri clippy; do
+for TOOL in rls rustfmt clippy; do
     echo "Verifying status of $TOOL..."
     if echo "$CHANGED_FILES" | grep -q "^M[[:blank:]]src/tools/$TOOL$"; then
         echo "This PR updated 'src/tools/$TOOL', verifying if status is 'test-pass'..."

diff --git a/src/tools/clippy b/src/tools/clippy
diff --git a/src/tools/miri b/src/tools/miri