diff options
| author | Nick Cameron <ncameron@mozilla.com> | 2017-11-10 15:09:39 +1300 |
|---|---|---|
| committer | Nick Cameron <ncameron@mozilla.com> | 2017-11-13 10:51:29 +1300 |
| commit | 63d854acf2ddcf127700940e4762393af4baabbf (patch) | |
| tree | 03c7b2c33d31ce38e113ac94842cb763b21b42cf /src/bootstrap/lib.rs | |
| parent | fb5ba4ef90bda82b4aa7328927d4413c7f33683d (diff) | |
| download | rust-63d854acf2ddcf127700940e4762393af4baabbf.tar.gz rust-63d854acf2ddcf127700940e4762393af4baabbf.zip | |
Distribute Rustfmt
Diffstat (limited to 'src/bootstrap/lib.rs')
| -rw-r--r-- | src/bootstrap/lib.rs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index 479283b3595..68329922592 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -222,6 +222,7 @@ pub struct Build { rust_info: channel::GitInfo, cargo_info: channel::GitInfo, rls_info: channel::GitInfo, + rustfmt_info: channel::GitInfo, local_rebuild: bool, fail_fast: bool, verbosity: usize, @@ -304,6 +305,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 rustfmt_info = channel::GitInfo::new(&config, &src.join("src/tools/rustfmt")); Build { initial_rustc: config.initial_rustc.clone(), @@ -323,6 +325,7 @@ impl Build { rust_info, cargo_info, rls_info, + rustfmt_info, cc: HashMap::new(), cxx: HashMap::new(), ar: HashMap::new(), @@ -814,6 +817,11 @@ impl Build { self.package_vers(&self.release_num("rls")) } + /// Returns the value of `package_vers` above for rustfmt + fn rustfmt_package_vers(&self) -> String { + self.package_vers(&self.release_num("rustfmt")) + } + /// Returns the `version` string associated with this compiler for Rust /// itself. /// |
