rustbuild: dist cargo-fmt as part of rustfmt

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>

diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index 7bf385301fab52acc0cd1fd87c5f6cb79b60cbfb..9009be247a651cf63913b9274dd5a7aec76d4537 100644 (file)
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -1163,7 +1163,12 @@ fn run(self, builder: &Builder) -> Option<PathBuf> {
             compiler: builder.compiler(stage, build.build),
             target
         }).expect("Rustfmt to build: toolstate is testing");
+        let cargofmt = builder.ensure(tool::Cargofmt {
+            compiler: builder.compiler(stage, build.build),
+            target
+        }).expect("Rustfmt to build: toolstate is testing");
         install(&rustfmt, &image.join("bin"), 0o755);
+        install(&cargofmt, &image.join("bin"), 0o755);
         let doc = image.join("share/doc/rustfmt");
         install(&src.join("README.md"), &doc, 0o644);
         install(&src.join("LICENSE-MIT"), &doc, 0o644);

diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
index eb403f88cb05f9a06fa7cdb0df956a5b119c6ca2..bc7ec93ca8af0b2ace010c882d2ae5e4f0a4cb2d 100644 (file)
--- a/src/bootstrap/tool.rs
+++ b/src/bootstrap/tool.rs
@@ -451,6 +451,7 @@ fn run($sel, $builder: &Builder) -> Option<PathBuf> {
 }
 
 tool_extended!((self, builder),
+    Cargofmt, rustfmt, "src/tools/rustfmt", "cargo-fmt", {};
     Clippy, clippy, "src/tools/clippy", "clippy-driver", {
         // Clippy depends on procedural macros (serde), which requires a full host
         // compiler to be available, so we need to depend on that.