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

44
src/bootstrap/dist.rs
View file

@ -1424,7 +1424,7 @@ impl Step for Extended {
let xform = |p: &Path| { let xform = |p: &Path| {
let mut contents = t!(fs::read_to_string(p)); 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) { if !built_tools.contains(tool) {
contents = filter(&contents, tool); contents = filter(&contents, tool);
} }
@ -1465,7 +1465,8 @@ impl Step for Extended {
prepare("rust-analysis"); prepare("rust-analysis");
prepare("clippy"); prepare("clippy");
prepare("miri"); 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) { if built_tools.contains(tool) {
prepare(tool); prepare(tool);
} }
@ -1525,7 +1526,8 @@ impl Step for Extended {
prepare("rust-std"); prepare("rust-std");
prepare("clippy"); prepare("clippy");
prepare("miri"); prepare("miri");
for tool in &["rust-demangler", "rust-analyzer"] { prepare("rust-analyzer");
for tool in &["rust-demangler"] {
if built_tools.contains(tool) { if built_tools.contains(tool) {
prepare(tool); prepare(tool);
} }
@ -1609,25 +1611,23 @@ impl Step for Extended {
.arg("-out") .arg("-out")
.arg(exe.join("StdGroup.wxs")), .arg(exe.join("StdGroup.wxs")),
); );
if built_tools.contains("rust-analyzer") { builder.run(
builder.run( Command::new(&heat)
Command::new(&heat) .current_dir(&exe)
.current_dir(&exe) .arg("dir")
.arg("dir") .arg("rust-analyzer")
.arg("rust-analyzer") .args(&heat_flags)
.args(&heat_flags) .arg("-cg")
.arg("-cg") .arg("RustAnalyzerGroup")
.arg("RustAnalyzerGroup") .arg("-dr")
.arg("-dr") .arg("RustAnalyzer")
.arg("RustAnalyzer") .arg("-var")
.arg("-var") .arg("var.RustAnalyzerDir")
.arg("var.RustAnalyzerDir") .arg("-out")
.arg("-out") .arg(exe.join("RustAnalyzerGroup.wxs"))
.arg(exe.join("RustAnalyzerGroup.wxs")) .arg("-t")
.arg("-t") .arg(etc.join("msi/remove-duplicates.xsl")),
.arg(etc.join("msi/remove-duplicates.xsl")), );
);
}
builder.run( builder.run(
Command::new(&heat) Command::new(&heat)
.current_dir(&exe) .current_dir(&exe)