Skip to content

Commit 507c575

Browse files
authored
Rollup merge of #142346 - Shourya742:2025-06-11-add-tracing-import-to-execution-context, r=Kobzol
Add tracing import to execution context In #141909, we missed adding the trace_cmd import in the execution context module. This PR fixes that. Additionally, we are updating the mingw-check-2 check command to include BOOTSTRAP_TRACING=1 to help ensure we don't miss such cases in future PRs. r? `@Kobzol`
2 parents 13f9542 + d4d90ca commit 507c575

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

src/bootstrap/src/utils/execution_context.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
use std::sync::{Arc, Mutex};
77

88
use crate::core::config::DryRun;
9+
#[cfg(feature = "tracing")]
10+
use crate::trace_cmd;
911
use crate::{BehaviorOnFailure, BootstrapCommand, CommandOutput, OutputMode, exit};
1012

1113
#[derive(Clone, Default)]

src/ci/docker/host-x86_64/mingw-check-2/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,7 @@ ENV SCRIPT \
3636
RUSTDOCFLAGS=\"--document-private-items --document-hidden-items\" python3 ../x.py doc --stage 1 library && \
3737
mkdir -p /checkout/obj/staging/doc && \
3838
cp -r build/x86_64-unknown-linux-gnu/doc /checkout/obj/staging && \
39-
RUSTDOCFLAGS=\"--document-private-items --document-hidden-items\" python3 ../x.py doc --stage 1 library/test
39+
RUSTDOCFLAGS=\"--document-private-items --document-hidden-items\" python3 ../x.py doc --stage 1 library/test && \
40+
# The BOOTSTRAP_TRACING flag is added to verify whether the
41+
# bootstrap process compiles successfully with this flag enabled.
42+
BOOTSTRAP_TRACING=1 python3 ../x.py --help

0 commit comments

Comments
 (0)