From db303c1d63636ad64223291e2c568005a94c08c9 Mon Sep 17 00:00:00 2001
From: ljedrz <ljedrz@gmail.com>
Date: Thu, 26 Jul 2018 11:44:05 +0200
Subject: [PATCH] Minor improvements to bootstrap

---
 src/bootstrap/compile.rs | 9 ++++-----
 src/bootstrap/dist.rs    | 9 ++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
index 04e8e133b03a1..6ed926e9875ec 100644
--- a/src/bootstrap/compile.rs
+++ b/src/bootstrap/compile.rs
@@ -305,8 +305,8 @@ impl Step for StartupObjects {
         t!(fs::create_dir_all(dst_dir));
 
         for file in &["rsbegin", "rsend"] {
-            let src_file = &src_dir.join(file.to_string() + ".rs");
-            let dst_file = &dst_dir.join(file.to_string() + ".o");
+            let src_file = &src_dir.join(file).with_extension("rs");
+            let dst_file = &dst_dir.join(file).with_extension("o");
             if !up_to_date(src_file, dst_file) {
                 let mut cmd = Command::new(&builder.initial_rustc);
                 builder.run(cmd.env("RUSTC_BOOTSTRAP", "1")
@@ -317,7 +317,7 @@ impl Step for StartupObjects {
                             .arg(src_file));
             }
 
-            builder.copy(dst_file, &sysroot_dir.join(file.to_string() + ".o"));
+            builder.copy(dst_file, &sysroot_dir.join(file).with_extension("o"));
         }
 
         for obj in ["crt2.o", "dllcrt2.o"].iter() {
@@ -1141,8 +1141,7 @@ pub fn run_cargo(builder: &Builder, cargo: &mut Command, stamp: &Path, is_check:
             None => panic!("no output generated for {:?} {:?}", prefix, extension),
         };
         if is_dylib(path_to_add) {
-            let candidate = format!("{}.lib", path_to_add);
-            let candidate = PathBuf::from(candidate);
+            let candidate = PathBuf::from(path_to_add).with_extension("lib");
             if candidate.exists() {
                 deps.push(candidate);
             }
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index 7b4808ef018f7..ac5964c2b60d4 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -892,7 +892,7 @@ impl Step for Src {
         builder.run(&mut cmd);
 
         builder.remove_dir(&image);
-        distdir(builder).join(&format!("{}.tar.gz", name))
+        distdir(builder).join(PathBuf::from(name).with_extension("tar.gz"))
     }
 }
 
@@ -992,9 +992,8 @@ impl Step for PlainSourceTarball {
 
         // Create plain source tarball
         let plain_name = format!("rustc-{}-src", builder.rust_package_vers());
-        let mut tarball = distdir(builder).join(&format!("{}.tar.gz", plain_name));
-        tarball.set_extension(""); // strip .gz
-        tarball.set_extension(""); // strip .tar
+        let tarball_name = PathBuf::from(&plain_name).with_extension("tar.gz");
+        let tarball = distdir(builder).join(&plain_name);
         if let Some(dir) = tarball.parent() {
             builder.create_dir(&dir);
         }
@@ -1006,7 +1005,7 @@ impl Step for PlainSourceTarball {
            .arg("--work-dir=.")
            .current_dir(tmpdir(builder));
         builder.run(&mut cmd);
-        distdir(builder).join(&format!("{}.tar.gz", plain_name))
+        distdir(builder).join(&tarball_name)
     }
 }