Skip to content

Commit d0d224d

Browse files
committed
Auto merge of rust-lang#135508 - chriskrycho:trpl-edition-updates, r=ehuss
[beta] TRPL: incorporate all backward-compatible Edition changes This incorporates all the backwards-compatible changes for the 2024 Edition. There will also be a follow-on PR to land revisions to the new chapter on async so it can be as ready as possible when officially released with 1.85 and the 2024 Edition. Additionally, there are a few other, non-backward-compatible, changes (largely around `use<..>`) we can only land using the stable edition, which we may or may not be able to land in 1.85 by using the beta toolchain in the example code. Those may or may not be ported over, depending on how that does or does not play with the infrastructure. This is identical to rust-lang#135507 except that this targets `beta` instead of `master`, with the intent that these changes land in 1.85 and go out with the Edition release.
2 parents fe9b975 + f836dc2 commit d0d224d

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

src/bootstrap/src/core/build_steps/tool.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,11 @@ macro_rules! bootstrap_tool {
334334
}
335335

336336
bootstrap_tool!(
337-
Rustbook, "src/tools/rustbook", "rustbook", submodules = SUBMODULES_FOR_RUSTBOOK;
337+
// This is marked as an external tool because it includes dependencies
338+
// from submodules. Trying to keep the lints in sync between all the repos
339+
// is a bit of a pain. Unfortunately it means the rustbook source itself
340+
// doesn't deny warnings, but it is a relatively small piece of code.
341+
Rustbook, "src/tools/rustbook", "rustbook", is_external_tool = true, submodules = SUBMODULES_FOR_RUSTBOOK;
338342
UnstableBookGen, "src/tools/unstable-book-gen", "unstable-book-gen";
339343
Tidy, "src/tools/tidy", "tidy";
340344
Linkchecker, "src/tools/linkchecker", "linkchecker";

0 commit comments

Comments
 (0)