about summary refs log tree commit diff
path: root/src/bootstrap/lib.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/lib.rs
parent48af7714d81bfa9a30d2f0175968ca5232fa23b5 (diff)
downloadrust-8f55152f8480e40ff08486f5b107dd3a149b6b14.tar.gz
rust-8f55152f8480e40ff08486f5b107dd3a149b6b14.zip
Did you mean to block nightlies on clippy?
Diffstat (limited to 'src/bootstrap/lib.rs')
-rw-r--r--src/bootstrap/lib.rs8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
index b5d450b8839..414f17dfad4 100644
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
@@ -248,6 +248,7 @@ pub struct Build {
     rust_info: channel::GitInfo,
     cargo_info: channel::GitInfo,
     rls_info: channel::GitInfo,
+    clippy_info: channel::GitInfo,
     rustfmt_info: channel::GitInfo,
     local_rebuild: bool,
     fail_fast: bool,
@@ -363,6 +364,7 @@ impl Build {
         let rust_info = channel::GitInfo::new(&config, &src);
         let cargo_info = channel::GitInfo::new(&config, &src.join("src/tools/cargo"));
         let rls_info = channel::GitInfo::new(&config, &src.join("src/tools/rls"));
+        let clippy_info = channel::GitInfo::new(&config, &src.join("src/tools/clippy"));
         let rustfmt_info = channel::GitInfo::new(&config, &src.join("src/tools/rustfmt"));
 
         let mut build = Build {
@@ -384,6 +386,7 @@ impl Build {
             rust_info,
             cargo_info,
             rls_info,
+            clippy_info,
             rustfmt_info,
             cc: HashMap::new(),
             cxx: HashMap::new(),
@@ -968,6 +971,11 @@ impl Build {
         self.package_vers(&self.release_num("rls"))
     }
 
+    /// Returns the value of `package_vers` above for clippy
+    fn clippy_package_vers(&self) -> String {
+        self.package_vers(&self.release_num("clippy"))
+    }
+
     /// Returns the value of `package_vers` above for rustfmt
     fn rustfmt_package_vers(&self) -> String {
         self.package_vers(&self.release_num("rustfmt"))