diff options
| author | Matthias Krüger <476013+matthiaskrgr@users.noreply.github.com> | 2025-06-11 22:58:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-11 22:58:27 +0200 |
| commit | 507c57554d776c533c411fcb4585cfbe0bbe6b35 (patch) | |
| tree | aaa135828e504e806c6e1dcfac16c4c7eda5a9aa /src | |
| parent | 13f95426fdf405748a43b97fa4e1552279c5fbb4 (diff) | |
| parent | d4d90ca3d26f9f620a55561e31f3ee3923efe190 (diff) | |
| download | rust-507c57554d776c533c411fcb4585cfbe0bbe6b35.tar.gz rust-507c57554d776c533c411fcb4585cfbe0bbe6b35.zip | |
Rollup merge of #142346 - Shourya742:2025-06-11-add-tracing-import-to-execution-context, r=Kobzol
Add tracing import to execution context In https://github.com/rust-lang/rust/pull/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`
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/src/utils/execution_context.rs | 2 | ||||
| -rw-r--r-- | src/ci/docker/host-x86_64/mingw-check-2/Dockerfile | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/bootstrap/src/utils/execution_context.rs b/src/bootstrap/src/utils/execution_context.rs index d12c02c161d..a5e1e9bcc07 100644 --- a/src/bootstrap/src/utils/execution_context.rs +++ b/src/bootstrap/src/utils/execution_context.rs @@ -6,6 +6,8 @@ use std::sync::{Arc, Mutex}; use crate::core::config::DryRun; +#[cfg(feature = "tracing")] +use crate::trace_cmd; use crate::{BehaviorOnFailure, BootstrapCommand, CommandOutput, OutputMode, exit}; #[derive(Clone, Default)] diff --git a/src/ci/docker/host-x86_64/mingw-check-2/Dockerfile b/src/ci/docker/host-x86_64/mingw-check-2/Dockerfile index a1d04bd984c..ce18a181d31 100644 --- a/src/ci/docker/host-x86_64/mingw-check-2/Dockerfile +++ b/src/ci/docker/host-x86_64/mingw-check-2/Dockerfile @@ -36,4 +36,7 @@ ENV SCRIPT \ RUSTDOCFLAGS=\"--document-private-items --document-hidden-items\" python3 ../x.py doc --stage 1 library && \ mkdir -p /checkout/obj/staging/doc && \ cp -r build/x86_64-unknown-linux-gnu/doc /checkout/obj/staging && \ - RUSTDOCFLAGS=\"--document-private-items --document-hidden-items\" python3 ../x.py doc --stage 1 library/test + RUSTDOCFLAGS=\"--document-private-items --document-hidden-items\" python3 ../x.py doc --stage 1 library/test && \ + # The BOOTSTRAP_TRACING flag is added to verify whether the + # bootstrap process compiles successfully with this flag enabled. + BOOTSTRAP_TRACING=1 python3 ../x.py --help |