Skip to content

Commit 494cbd8

Browse files
committed
Auto merge of #7440 - alexcrichton:always-pipeline, r=ehuss
Remove dynamic detection of pipelining support Pipelining has made its way to stable so no need to check that any more.
2 parents 74383b4 + 0afe1b1 commit 494cbd8

File tree

2 files changed

+2
-17
lines changed

2 files changed

+2
-17
lines changed

src/cargo/core/compiler/build_context/target_info.rs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ pub struct TargetInfo {
3434
pub rustflags: Vec<String>,
3535
/// Extra flags to pass to `rustdoc`, see `env_args`.
3636
pub rustdocflags: Vec<String>,
37-
pub supports_pipelining: Option<bool>,
3837
}
3938

4039
/// Kind of each file generated by a Unit, part of `FileType`.
@@ -102,18 +101,6 @@ impl TargetInfo {
102101
.args(&rustflags)
103102
.env_remove("RUSTC_LOG");
104103

105-
// NOTE: set this unconditionally to `true` once support for `--json`
106-
// rides to stable.
107-
//
108-
// Also note that we only learn about this functionality for the host
109-
// compiler since the host/target rustc are always the same.
110-
let mut pipelining_test = process.clone();
111-
pipelining_test.args(&["--error-format=json", "--json=artifacts"]);
112-
let supports_pipelining = match kind {
113-
Kind::Host => Some(rustc.cached_output(&pipelining_test).is_ok()),
114-
Kind::Target => None,
115-
};
116-
117104
let target_triple = requested_target
118105
.as_ref()
119106
.map(|s| s.as_str())
@@ -203,7 +190,6 @@ impl TargetInfo {
203190
"RUSTDOCFLAGS",
204191
)?,
205192
cfg,
206-
supports_pipelining,
207193
})
208194
}
209195

src/cargo/core/compiler/context/mod.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,8 @@ impl<'a, 'cfg> Context<'a, 'cfg> {
100100

101101
let pipelining = bcx
102102
.config
103-
.get_bool("build.pipelining")?
104-
.map(|t| t.val)
105-
.unwrap_or(bcx.host_info.supports_pipelining.unwrap());
103+
.get::<Option<bool>>("build.pipelining")?
104+
.unwrap_or(true);
106105

107106
Ok(Self {
108107
bcx,

0 commit comments

Comments
 (0)