about summary refs log tree commit diff
path: root/src/bootstrap/install.rs
diff options
context:
space:
mode:
authorOliver Schneider <github35764891676564198441@oli-obk.de>2018-05-28 13:34:29 +0200
committerOliver Schneider <github35764891676564198441@oli-obk.de>2018-07-01 01:35:39 +0200
commit8f55152f8480e40ff08486f5b107dd3a149b6b14 (patch)
tree182b7ecad486203546ebafcef38d8e02b8de9b13 /src/bootstrap/install.rs
parent48af7714d81bfa9a30d2f0175968ca5232fa23b5 (diff)
downloadrust-8f55152f8480e40ff08486f5b107dd3a149b6b14.tar.gz
rust-8f55152f8480e40ff08486f5b107dd3a149b6b14.zip
Did you mean to block nightlies on clippy?
Diffstat (limited to 'src/bootstrap/install.rs')
-rw-r--r--src/bootstrap/install.rs11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/bootstrap/install.rs b/src/bootstrap/install.rs
index b37a007e863..97fd6f77646 100644
--- a/src/bootstrap/install.rs
+++ b/src/bootstrap/install.rs
@@ -39,6 +39,9 @@ pub fn install_cargo(builder: &Builder, stage: u32, host: Interned<String>) {
 pub fn install_rls(builder: &Builder, stage: u32, host: Interned<String>) {
     install_sh(builder, "rls", "rls", stage, Some(host));
 }
+pub fn install_clippy(builder: &Builder, stage: u32, host: Interned<String>) {
+    install_sh(builder, "clippy", "clippy", stage, Some(host));
+}
 
 pub fn install_rustfmt(builder: &Builder, stage: u32, host: Interned<String>) {
     install_sh(builder, "rustfmt", "rustfmt", stage, Some(host));
@@ -216,6 +219,14 @@ install!((self, builder, _config),
             builder.info(&format!("skipping Install RLS stage{} ({})", self.stage, self.target));
         }
     };
+    Clippy, "clippy", Self::should_build(_config), only_hosts: true, {
+        if builder.ensure(dist::Clippy { stage: self.stage, target: self.target }).is_some() ||
+            Self::should_install(builder) {
+            install_clippy(builder, self.stage, self.target);
+        } else {
+            builder.info(&format!("skipping Install clippy stage{} ({})", self.stage, self.target));
+        }
+    };
     Rustfmt, "rustfmt", Self::should_build(_config), only_hosts: true, {
         if builder.ensure(dist::Rustfmt { stage: self.stage, target: self.target }).is_some() ||
             Self::should_install(builder) {