Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 53b352e

Browse files
committedSep 19, 2019
Auto merge of #64616 - Centril:rollup-du6728f, r=Centril
Rollup of 6 pull requests Successful merges: - #63448 (fix Miri discriminant handling) - #64592 (Point at original span when emitting unreachable lint) - #64601 (Fix backticks in documentation) - #64606 (Remove unnecessary `mut` in doc example) - #64611 (rustbuild: Don't package libstd twice) - #64613 (rustbuild: Copy crate doc files fewer times) Failed merges: r? @ghost
2 parents 9b9d2af + 99cbffb commit 53b352e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+633
-49
lines changed
 

‎src/bootstrap/dist.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -762,7 +762,7 @@ impl Step for Analysis {
762762
return distdir(builder).join(format!("{}-{}.tar.gz", name, target));
763763
}
764764

765-
builder.ensure(Std { compiler, target });
765+
builder.ensure(compile::Std { compiler, target });
766766

767767
let image = tmpdir(builder).join(format!("{}-{}-image", name, target));
768768

‎src/bootstrap/doc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,11 +476,11 @@ impl Step for Std {
476476
.arg("--index-page").arg(&builder.src.join("src/doc/index.md"));
477477

478478
builder.run(&mut cargo);
479-
builder.cp_r(&my_out, &out);
480479
};
481480
for krate in &["alloc", "core", "std", "proc_macro", "test"] {
482481
run_cargo_rustdoc_for(krate);
483482
}
483+
builder.cp_r(&my_out, &out);
484484
}
485485
}
486486

0 commit comments

Comments
 (0)
Please sign in to comment.