Skip to content

Commit 1d24eae

Browse files
committed
compiletest/rmake: rename cmd to rustc
1 parent 46ccba3 commit 1d24eae

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

src/tools/compiletest/src/runtest.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3606,8 +3606,9 @@ impl<'test> TestCx<'test> {
36063606

36073607
// FIXME(jieyouxu): explain what the hecc we are doing here.
36083608
// FIXME(jieyouxu): audit these env vars. some of them only makes sense for make, not rustc!
3609-
let mut cmd = Command::new(&self.config.rustc_path);
3610-
cmd.arg("-o")
3609+
let mut rustc = Command::new(&self.config.rustc_path);
3610+
rustc
3611+
.arg("-o")
36113612
.arg(&recipe_bin)
36123613
.arg(format!("-Ldependency={}", &support_lib_path.parent().unwrap().to_string_lossy()))
36133614
.arg(format!("-Ldependency={}", &support_lib_deps.to_string_lossy()))
@@ -3628,7 +3629,7 @@ impl<'test> TestCx<'test> {
36283629

36293630
// In test code we want to be very pedantic about values being silently discarded that are
36303631
// annotated with `#[must_use]`.
3631-
cmd.arg("-Dunused_must_use");
3632+
rustc.arg("-Dunused_must_use");
36323633

36333634
// FIXME(jieyouxu): explain this!
36343635
if std::env::var_os("COMPILETEST_FORCE_STAGE0").is_some() {
@@ -3637,10 +3638,10 @@ impl<'test> TestCx<'test> {
36373638
debug!(?stage0_sysroot);
36383639
debug!(exists = stage0_sysroot.exists());
36393640

3640-
cmd.arg("--sysroot").arg(&stage0_sysroot);
3641+
rustc.arg("--sysroot").arg(&stage0_sysroot);
36413642
}
36423643

3643-
let res = self.run_command_to_procres(&mut cmd);
3644+
let res = self.run_command_to_procres(&mut rustc);
36443645
if !res.status.success() {
36453646
self.fatal_proc_rec("run-make test failed: could not build `rmake.rs` recipe", &res);
36463647
}

0 commit comments

Comments
 (0)