Skip to content

Commit 5e1a614

Browse files
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.
1 parent 440d937 commit 5e1a614

File tree

4 files changed

+3
-5
lines changed

4 files changed

+3
-5
lines changed

compiler/rustc_codegen_cranelift/src/bin/cg_clif_build_sysroot.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
99
#![feature(rustc_private)]
1010

11-
extern crate rustc_data_structures;
1211
extern crate rustc_driver;
1312
extern crate rustc_interface;
1413
extern crate rustc_session;

src/bootstrap/check.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ impl Step for CodegenBackend {
262262
let mut cargo = builder.cargo(
263263
compiler,
264264
Mode::Codegen,
265-
SourceType::Submodule,
265+
SourceType::InTree,
266266
target,
267267
cargo_subcommand(builder.kind),
268268
);

src/bootstrap/compile.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -817,8 +817,7 @@ impl Step for CodegenBackend {
817817

818818
let out_dir = builder.cargo_out(compiler, Mode::Codegen, target);
819819

820-
let mut cargo =
821-
builder.cargo(compiler, Mode::Codegen, SourceType::Submodule, target, "build");
820+
let mut cargo = builder.cargo(compiler, Mode::Codegen, SourceType::InTree, target, "build");
822821
cargo
823822
.arg("--manifest-path")
824823
.arg(builder.src.join(format!("compiler/rustc_codegen_{}/Cargo.toml", backend)));

src/bootstrap/test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ impl Step for Rustfmt {
390390
host,
391391
"test",
392392
"src/tools/rustfmt",
393-
SourceType::Submodule,
393+
SourceType::InTree,
394394
&[],
395395
);
396396

0 commit comments

Comments
 (0)