From 7dfbf59f100c52e991796739ff21b9720219703f Mon Sep 17 00:00:00 2001
From: Vadim Petrochenkov <vadim.petrochenkov@gmail.com>
Date: Thu, 23 Jul 2020 10:25:49 +0300
Subject: [PATCH] cleanup: Remove duplicate library names from `Cargo.toml`s

---
 compiler/rustc/Cargo.toml       | 4 ----
 compiler/rustc_lexer/Cargo.toml | 1 -
 src/bootstrap/Cargo.toml        | 1 -
 src/bootstrap/compile.rs        | 2 +-
 src/build_helper/Cargo.toml     | 1 -
 src/librustc_llvm/Cargo.toml    | 1 -
 src/librustdoc/Cargo.toml       | 1 -
 7 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/compiler/rustc/Cargo.toml b/compiler/rustc/Cargo.toml
index 4340d50f845..cf011e63e02 100644
--- a/compiler/rustc/Cargo.toml
+++ b/compiler/rustc/Cargo.toml
@@ -4,10 +4,6 @@ name = "rustc-main"
 version = "0.0.0"
 edition = '2018'
 
-[[bin]]
-name = "rustc_binary"
-path = "src/main.rs"
-
 [dependencies]
 rustc_driver = { path = "../rustc_driver" }
 
diff --git a/compiler/rustc_lexer/Cargo.toml b/compiler/rustc_lexer/Cargo.toml
index 28b56f6fef4..390a21a501c 100644
--- a/compiler/rustc_lexer/Cargo.toml
+++ b/compiler/rustc_lexer/Cargo.toml
@@ -14,7 +14,6 @@ Rust lexer used by rustc. No stability guarantees are provided.
 # This will be used when publishing this crate as `rustc-ap-rustc_lexer`.
 [lib]
 doctest = false
-name = "rustc_lexer"
 
 # Note that this crate purposefully does not depend on other rustc crates
 [dependencies]
diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml
index c4918d7f2e7..faec2c53742 100644
--- a/src/bootstrap/Cargo.toml
+++ b/src/bootstrap/Cargo.toml
@@ -5,7 +5,6 @@ version = "0.0.0"
 edition = "2018"
 
 [lib]
-name = "bootstrap"
 path = "lib.rs"
 doctest = false
 
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
index bf06b61d1d7..7814ca8e5bb 100644
--- a/src/bootstrap/compile.rs
+++ b/src/bootstrap/compile.rs
@@ -819,7 +819,7 @@ fn run(self, builder: &Builder<'_>) -> Compiler {
 
         // Link the compiler binary itself into place
         let out_dir = builder.cargo_out(build_compiler, Mode::Rustc, host);
-        let rustc = out_dir.join(exe("rustc_binary", host));
+        let rustc = out_dir.join(exe("rustc-main", host));
         let bindir = sysroot.join("bin");
         t!(fs::create_dir_all(&bindir));
         let compiler = builder.rustc(target_compiler);
diff --git a/src/build_helper/Cargo.toml b/src/build_helper/Cargo.toml
index 04c7820b456..2420f1b7f18 100644
--- a/src/build_helper/Cargo.toml
+++ b/src/build_helper/Cargo.toml
@@ -5,5 +5,4 @@ authors = ["The Rust Project Developers"]
 edition = "2018"
 
 [lib]
-name = "build_helper"
 path = "lib.rs"
diff --git a/src/librustc_llvm/Cargo.toml b/src/librustc_llvm/Cargo.toml
index 9f2711eec10..7120f2e991a 100644
--- a/src/librustc_llvm/Cargo.toml
+++ b/src/librustc_llvm/Cargo.toml
@@ -5,7 +5,6 @@ version = "0.0.0"
 edition = "2018"
 
 [lib]
-name = "rustc_llvm"
 path = "lib.rs"
 
 [features]
diff --git a/src/librustdoc/Cargo.toml b/src/librustdoc/Cargo.toml
index 09afb3cae5b..616f208bb2f 100644
--- a/src/librustdoc/Cargo.toml
+++ b/src/librustdoc/Cargo.toml
@@ -5,7 +5,6 @@ version = "0.0.0"
 edition = "2018"
 
 [lib]
-name = "rustdoc"
 path = "lib.rs"
 
 [dependencies]