about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-11-11 06:29:15 +0000
committerbors <bors@rust-lang.org>2019-11-11 06:29:15 +0000
commit2a9be46cc4b5aa09e978653aba071c7c52b531eb (patch)
tree34f541562c1c7dc414576bae79624f9fa1f170c3 /src
parent1062b698c1faa66f7d53078cbb9ef2a493dc2ab7 (diff)
parent955f86107512e9ebfd088a57a5395b0f2989a282 (diff)
Auto merge of #66207 - Manishearth:clippyup, r=Centril
Update clippy

Fixes #66150

r? @ghost
Diffstat (limited to 'src')
-rw-r--r--src/bootstrap/test.rs5
m---------src/tools/clippy18
2 files changed, 12 insertions, 11 deletions
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index 60f0dccdb07..a858ed42bad 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -570,7 +570,12 @@ impl Step for Clippy {
             let host_libs = builder
                 .stage_out(compiler, Mode::ToolRustc)
                 .join(builder.cargo_dir());
+            let target_libs = builder
+                .stage_out(compiler, Mode::ToolRustc)
+                .join(&self.host)
+                .join(builder.cargo_dir());
             cargo.env("HOST_LIBS", host_libs);
+            cargo.env("TARGET_LIBS", target_libs);
             // clippy tests need to find the driver
             cargo.env("CLIPPY_DRIVER_PATH", clippy);
 
diff --git a/src/tools/clippy b/src/tools/clippy
-Subproject c8e3cfbdd997839c771ca32c7ac860fe95149a0
+Subproject 3abdd2f1ced4cf3a44c7de88c5e39b3bb5037c4