bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove unused argument rustc_cargo.

Browse source
This commit is contained in:
O01eg 2017-12-26 00:00:09 +03:00
parent f05282f036
commit 83e76d6f29
No known key found for this signature in database
GPG key ID: D1A94F2400FBC7E5
3 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/bootstrap/check.rs
View file

@ -1166,7 +1166,7 @@ impl Step for Crate {
} }
Mode::Librustc => { Mode::Librustc => {
builder.ensure(compile::Rustc { compiler, target }); builder.ensure(compile::Rustc { compiler, target });
compile::rustc_cargo(build, &compiler, target, &mut cargo); compile::rustc_cargo(build, target, &mut cargo);
("librustc", "rustc-main") ("librustc", "rustc-main")
} }
_ => panic!("can only test libraries"), _ => panic!("can only test libraries"),

3
src/bootstrap/compile.rs
View file

@ -485,7 +485,7 @@ impl Step for Rustc {
build.clear_if_dirty(&stage_out, &libtest_stamp(build, compiler, target)); build.clear_if_dirty(&stage_out, &libtest_stamp(build, compiler, target));
let mut cargo = builder.cargo(compiler, Mode::Librustc, target, "build"); let mut cargo = builder.cargo(compiler, Mode::Librustc, target, "build");
rustc_cargo(build, &compiler, target, &mut cargo); rustc_cargo(build, target, &mut cargo);
run_cargo(build, run_cargo(build,
&mut cargo, &mut cargo,
&librustc_stamp(build, compiler, target)); &librustc_stamp(build, compiler, target));
@ -500,7 +500,6 @@ impl Step for Rustc {
/// Same as `std_cargo`, but for libtest /// Same as `std_cargo`, but for libtest
pub fn rustc_cargo(build: &Build, pub fn rustc_cargo(build: &Build,
_compiler: &Compiler,
target: Interned<String>, target: Interned<String>,
cargo: &mut Command) { cargo: &mut Command) {
cargo.arg("--features").arg(build.rustc_features()) cargo.arg("--features").arg(build.rustc_features())

2
src/bootstrap/doc.rs
View file

@ -616,7 +616,7 @@ impl Step for Rustc {
t!(symlink_dir_force(&my_out, &out_dir)); t!(symlink_dir_force(&my_out, &out_dir));
let mut cargo = builder.cargo(compiler, Mode::Librustc, target, "doc"); let mut cargo = builder.cargo(compiler, Mode::Librustc, target, "doc");
compile::rustc_cargo(build, &compiler, target, &mut cargo); compile::rustc_cargo(build, target, &mut cargo);
if build.config.compiler_docs { if build.config.compiler_docs {
// src/rustc/Cargo.toml contains a bin crate called rustc which // src/rustc/Cargo.toml contains a bin crate called rustc which