bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #102175 - oli-obk:miri_subtree_cleanup, r=jyn514

Browse source 
Also require other subtrees to always build successfully

r? ``@jyn514``
This commit is contained in:
Matthias Krüger 2022-09-24 07:38:56 +02:00 • committed by GitHub
commit 00dfc32cad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/bootstrap/dist.rs
View file

@ -1424,7 +1424,7 @@ impl Step for Extended {
let xform = |p: &Path| {
let mut contents = t!(fs::read_to_string(p));
for tool in &["rust-demangler", "rust-analyzer", "rustfmt"] {
for tool in &["rust-demangler"] {
if !built_tools.contains(tool) {
contents = filter(&contents, tool);
}
@ -1465,7 +1465,8 @@ impl Step for Extended {
prepare("rust-analysis");
prepare("clippy");
prepare("miri");
for tool in &["rust-docs", "rust-demangler", "rust-analyzer"] {
prepare("rust-analyzer");
for tool in &["rust-docs", "rust-demangler"] {
if built_tools.contains(tool) {
prepare(tool);
}
@ -1525,7 +1526,8 @@ impl Step for Extended {
prepare("rust-std");
prepare("clippy");
prepare("miri");
for tool in &["rust-demangler", "rust-analyzer"] {
prepare("rust-analyzer");
for tool in &["rust-demangler"] {
if built_tools.contains(tool) {
prepare(tool);
}
@ -1609,7 +1611,6 @@ impl Step for Extended {
.arg("-out")
.arg(exe.join("StdGroup.wxs")),
);
if built_tools.contains("rust-analyzer") {
builder.run(
Command::new(&heat)
.current_dir(&exe)
@ -1627,7 +1628,6 @@ impl Step for Extended {
.arg("-t")
.arg(etc.join("msi/remove-duplicates.xsl")),
);
}
builder.run(
Command::new(&heat)
.current_dir(&exe)