Skip to content

Commit

Permalink
Auto merge of #74668 - petrochenkov:noname, r=mark-i-m
Browse files Browse the repository at this point in the history
cleanup: Remove duplicate library names from `Cargo.toml`s
  • Loading branch information
bors committed Aug 30, 2020
2 parents 36b0d7e + 7dfbf59 commit 022e1fe
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 10 deletions.
4 changes: 0 additions & 4 deletions compiler/rustc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }

Expand Down
1 change: 0 additions & 1 deletion compiler/rustc_lexer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
1 change: 0 additions & 1 deletion src/bootstrap/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ version = "0.0.0"
edition = "2018"

[lib]
name = "bootstrap"
path = "lib.rs"
doctest = false

Expand Down
2 changes: 1 addition & 1 deletion src/bootstrap/compile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -819,7 +819,7 @@ impl Step for Assemble {

// 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);
Expand Down
1 change: 0 additions & 1 deletion src/build_helper/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@ authors = ["The Rust Project Developers"]
edition = "2018"

[lib]
name = "build_helper"
path = "lib.rs"
1 change: 0 additions & 1 deletion src/librustc_llvm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ version = "0.0.0"
edition = "2018"

[lib]
name = "rustc_llvm"
path = "lib.rs"

[features]
Expand Down
1 change: 0 additions & 1 deletion src/librustdoc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ version = "0.0.0"
edition = "2018"

[lib]
name = "rustdoc"
path = "lib.rs"

[dependencies]
Expand Down

0 comments on commit 022e1fe

Please sign in to comment.