Adjust to SourceType::InTree in several places

These were left over in migrations to subtrees, which should generally be treated
as-if it was local.

Also fixes a warning caused by this change.
This commit is contained in:
Mark Rousskov 2021-09-19 10:36:17 -04:00
parent 440d9372a2
commit 5e1a614b53
4 changed files with 3 additions and 5 deletions

View File

@ -8,7 +8,6 @@
#![feature(rustc_private)]
extern crate rustc_data_structures;
extern crate rustc_driver;
extern crate rustc_interface;
extern crate rustc_session;

View File

@ -262,7 +262,7 @@ impl Step for CodegenBackend {
let mut cargo = builder.cargo(
compiler,
Mode::Codegen,
SourceType::Submodule,
SourceType::InTree,
target,
cargo_subcommand(builder.kind),
);

View File

@ -817,8 +817,7 @@ impl Step for CodegenBackend {
let out_dir = builder.cargo_out(compiler, Mode::Codegen, target);
let mut cargo =
builder.cargo(compiler, Mode::Codegen, SourceType::Submodule, target, "build");
let mut cargo = builder.cargo(compiler, Mode::Codegen, SourceType::InTree, target, "build");
cargo
.arg("--manifest-path")
.arg(builder.src.join(format!("compiler/rustc_codegen_{}/Cargo.toml", backend)));

View File

@ -390,7 +390,7 @@ impl Step for Rustfmt {
host,
"test",
"src/tools/rustfmt",
SourceType::Submodule,
SourceType::InTree,
&[],
);