Skip to content

Commit 74633c3

Browse files
committed
Auto merge of #145844 - Zalathar:rollup-4kdll9t, r=Zalathar
Rollup of 10 pull requests Successful merges: - rust-lang/rust#135761 (Dial down detail of B-tree description) - rust-lang/rust#145620 (Account for impossible bounds making seemingly unsatisfyable dyn-to-dyn casts) - rust-lang/rust#145788 (Fix attribute target checking for macro calls) - rust-lang/rust#145794 (bootstrap.py: Improve CPU detection on NetBSD) - rust-lang/rust#145817 (cg_llvm: Replace the `llvm::Bool` typedef with a proper newtype) - rust-lang/rust#145820 (raw-dylib-elf: set correct `DT_VERDEFNUM`) - rust-lang/rust#145828 (Update `bitflags` to 2.9.3.) - rust-lang/rust#145830 (Remove the lifetime from `ExpTokenPair`/`SeqSep`.) - rust-lang/rust#145836 (Remove outdated bug comments) - rust-lang/rust#145842 (rustc-dev-guide subtree update) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 001c57d + 2f46f9d commit 74633c3

20 files changed

+167
-104
lines changed

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
425a9c0a0e365c0b8c6cfd00c2ded83a73bed9a0
1+
a1dbb443527bd126452875eb5d5860c1d001d761

src/SUMMARY.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@
103103
- [The `rustdoc-json` test suite](./rustdoc-internals/rustdoc-json-test-suite.md)
104104
- [GPU offload internals](./offload/internals.md)
105105
- [Installation](./offload/installation.md)
106+
- [Usage](./offload/usage.md)
106107
- [Autodiff internals](./autodiff/internals.md)
107108
- [Installation](./autodiff/installation.md)
108109
- [How to debug](./autodiff/debugging.md)

src/building/bootstrapping/what-bootstrapping-does.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Note that this documentation mostly covers user-facing information. See
2323

2424
### Overview
2525

26-
- Stage 0: the pre-compiled compiler
26+
- Stage 0: the pre-compiled compiler and standard library
2727
- Stage 1: from current code, by an earlier compiler
2828
- Stage 2: the truly current compiler
2929
- Stage 3: the same-result test
@@ -192,7 +192,7 @@ include, but are not limited to:
192192
artifacts'). If you're working on the standard library, this is normally the
193193
test command you want.
194194
- `./x build --stage 0` means to build with the stage0 `rustc`.
195-
- `./x doc --stage 0` means to document using the stage0 `rustdoc`.
195+
- `./x doc --stage 1` means to document using the stage0 `rustdoc`.
196196

197197
#### Examples of what *not* to do
198198

@@ -211,7 +211,7 @@ include, but are not limited to:
211211
In short, _stage 0 uses the `stage0` compiler to create `stage0` artifacts which
212212
will later be uplifted to be the stage1 compiler_.
213213

214-
In each stage, two major steps are performed:
214+
In each stage besides 0, two major steps are performed:
215215

216216
1. `std` is compiled by the stage N compiler.
217217
2. That `std` is linked to programs built by the stage N compiler, including the
-6.16 KB
Loading

src/img/dataflow-graphviz-example.png

-29.4 KB
Loading

src/img/github-cli.png

-11.5 KB
Loading

src/img/github-whitespace-changes.png

-10.8 KB
Loading

src/img/llvm-cov-show-01.png

-205 KB
Loading

src/img/other-peoples-commits.png

-106 KB
Loading

src/img/rustbot-submodules.png

-10.3 KB
Loading

0 commit comments

Comments
 (0)