Skip to content

Commit b1e095b

Browse files
Shourya742Kivooeo
authored andcommitted
move execution context inside exec and prune execution context, use command directly from bootstrap command inside start, and not via as_command_mut
1 parent 4daac57 commit b1e095b

File tree

7 files changed

+345
-353
lines changed

7 files changed

+345
-353
lines changed

src/bootstrap/src/core/builder/mod.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ use crate::core::build_steps::{
2222
use crate::core::config::flags::Subcommand;
2323
use crate::core::config::{DryRun, TargetSelection};
2424
use crate::utils::cache::Cache;
25-
use crate::utils::exec::{BootstrapCommand, command};
26-
use crate::utils::execution_context::ExecutionContext;
25+
use crate::utils::exec::{BootstrapCommand, ExecutionContext, command};
2726
use crate::utils::helpers::{self, LldThreads, add_dylib_path, exe, libdir, linker_args, t};
2827
use crate::{Build, Crate, trace};
2928

src/bootstrap/src/core/config/config.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ use crate::core::config::{
4747
};
4848
use crate::core::download::is_download_ci_available;
4949
use crate::utils::channel;
50-
use crate::utils::exec::command;
51-
use crate::utils::execution_context::ExecutionContext;
50+
use crate::utils::exec::{ExecutionContext, command};
5251
use crate::utils::helpers::{exe, get_host_target};
5352
use crate::{GitInfo, OnceLock, TargetSelection, check_ci_llvm, helpers, t};
5453

src/bootstrap/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ use cc::Tool;
3131
use termcolor::{ColorChoice, StandardStream, WriteColor};
3232
use utils::build_stamp::BuildStamp;
3333
use utils::channel::GitInfo;
34-
use utils::execution_context::ExecutionContext;
34+
use utils::exec::ExecutionContext;
3535

3636
use crate::core::builder;
3737
use crate::core::builder::Kind;
3838
use crate::core::config::{DryRun, LldMode, LlvmLibunwind, TargetSelection, flags};
39-
use crate::utils::exec::{BehaviorOnFailure, BootstrapCommand, CommandOutput, OutputMode, command};
39+
use crate::utils::exec::{BootstrapCommand, command};
4040
use crate::utils::helpers::{
4141
self, dir_is_empty, exe, libdir, set_file_times, split_debuginfo, symlink_dir,
4242
};

src/bootstrap/src/utils/channel.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
use std::fs;
99
use std::path::Path;
1010

11-
use super::execution_context::ExecutionContext;
11+
use super::exec::ExecutionContext;
1212
use super::helpers;
1313
use crate::Build;
1414
use crate::utils::helpers::t;

0 commit comments

Comments
 (0)