Skip to content

Commit 592a101

Browse files
committed
Auto merge of #119899 - onur-ozkan:redesign-stage0-std, r=albertlarsan68,jieyouxu,mark-simulacrum,kobzol,jyn514,Noratrieb,WaffleLapkin,RalfJung,bjorn3
redesign stage 0 std ### Summary **Blog post: https://blog.rust-lang.org/inside-rust/2025/05/29/redesigning-the-initial-bootstrap-sequence/** This PR changes how bootstrap builds the stage 1 compiler by switching to precompiled stage 0 standard library instead of building the in-tree one. The goal was to update bootstrap to use the beta standard library at stage 0 rather than compiling it from source (see the motivation at rust-lang/compiler-team#619). Previously, to build a stage 1 compiler bootstrap followed this path: ``` download stage0 compiler -> build in-tree std -> compile stage1 compiler with in-tree std ``` With this PR, the new path is: ``` download stage0 compiler -> compile stage1 compiler with precompiled stage0 std ``` This also means that `cfg(bootstrap)`/`cfg(not(bootstrap))` is no longer needed for library development. ### Building "library" Since stage0 `std` is no longer in-tree `x build/test/check library --stage 0` is now no-op. The minimum supported stage to build `std` is now 1. For the same reason, default stage values in the library profile is no longer 0. Because building the in-tree library now requires a stage1 compiler, I highly recommend library developers to enable `download-rustc` to speed up compilation time. <hr> **Blog post: https://blog.rust-lang.org/inside-rust/2025/05/29/redesigning-the-initial-bootstrap-sequence/** If you encounter a bug or unexpected results please open a topic in the [#t-infra/bootstrap](https://rust-lang.zulipchat.com/#narrow/channel/326414-t-infra.2Fbootstrap) Zulip channel or create a [bootstrap issue](https://github.com/rust-lang/rust/issues/new?template=bootstrap.md). (Review thread: https://rust-lang.zulipchat.com/#narrow/channel/326414-t-infra.2Fbootstrap/topic/Review.20thread.3A.20stage.200.20redesign.20PR/with/508271433) ~~Blocked on rust-lang/rust#122709 try-job: dist-x86_64-linux try-job: `x86_64-msvc*` try-job: `x86_64-apple-*` try-job: `aarch64-apple` try-job: x86_64-gnu try-job: `x86_64-gnu-llvm*`
2 parents 687ddbb + 257e73f commit 592a101

File tree

5 files changed

+53
-111
lines changed

5 files changed

+53
-111
lines changed

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

Lines changed: 35 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ compiler.
4545

4646
```mermaid
4747
graph TD
48-
s0c["stage0 compiler (1.63)"]:::downloaded -->|A| s0l("stage0 std (1.64)"):::with-s0c;
48+
s0c["stage0 compiler (1.86.0-beta.1)"]:::downloaded -->|A| s0l("stage0 std (1.86.0-beta.1)"):::downloaded;
4949
s0c & s0l --- stepb[ ]:::empty;
50-
stepb -->|B| s0ca["stage0 compiler artifacts (1.64)"]:::with-s0c;
51-
s0ca -->|copy| s1c["stage1 compiler (1.64)"]:::with-s0c;
52-
s1c -->|C| s1l("stage1 std (1.64)"):::with-s1c;
50+
stepb -->|B| s0ca["stage0 compiler artifacts (1.87.0-dev)"]:::with-s0c;
51+
s0ca -->|copy| s1c["stage1 compiler (1.87.0-dev)"]:::with-s0c;
52+
s1c -->|C| s1l("stage1 std (1.87.0-dev)"):::with-s1c;
5353
s1c & s1l --- stepd[ ]:::empty;
54-
stepd -->|D| s1ca["stage1 compiler artifacts (1.64)"]:::with-s1c;
54+
stepd -->|D| s1ca["stage1 compiler artifacts (1.87.0-dev)"]:::with-s1c;
5555
s1ca -->|copy| s2c["stage2 compiler"]:::with-s1c;
5656
5757
classDef empty width:0px,height:0px;
@@ -62,19 +62,21 @@ graph TD
6262

6363
### Stage 0: the pre-compiled compiler
6464

65-
The stage0 compiler is usually the current _beta_ `rustc` compiler and its
65+
The stage0 compiler is by default the very recent _beta_ `rustc` compiler and its
6666
associated dynamic libraries, which `./x.py` will download for you. (You can
67-
also configure `./x.py` to use something else.)
67+
also configure `./x.py` to change stage0 to something else.)
6868

69-
The stage0 compiler is then used only to compile [`src/bootstrap`],
70-
[`library/std`], and [`compiler/rustc`]. When assembling the libraries and
71-
binaries that will become the stage1 `rustc` compiler, the freshly compiled
72-
`std` and `rustc` are used. There are two concepts at play here: a compiler
73-
(with its set of dependencies) and its 'target' or 'object' libraries (`std` and
74-
`rustc`). Both are staged, but in a staggered manner.
69+
The precompiled stage0 compiler is then used only to compile [`src/bootstrap`] and [`compiler/rustc`]
70+
with precompiled stage0 std.
71+
72+
Note that to build the stage1 compiler we use the precompiled stage0 compiler and std.
73+
Therefore, to use a compiler with a std that is freshly built from the tree, you need to
74+
build the stage2 compiler.
75+
76+
There are two concepts at play here: a compiler (with its set of dependencies) and its
77+
'target' or 'object' libraries (`std` and `rustc`). Both are staged, but in a staggered manner.
7578

7679
[`compiler/rustc`]: https://github.com/rust-lang/rust/tree/master/compiler/rustc
77-
[`library/std`]: https://github.com/rust-lang/rust/tree/master/library/std
7880
[`src/bootstrap`]: https://github.com/rust-lang/rust/tree/master/src/bootstrap
7981

8082
### Stage 1: from current code, by an earlier compiler
@@ -84,26 +86,25 @@ The rustc source code is then compiled with the `stage0` compiler to produce the
8486

8587
### Stage 2: the truly current compiler
8688

87-
We then rebuild our `stage1` compiler with itself to produce the `stage2`
89+
We then rebuild the compiler using `stage1` compiler with in-tree std to produce the `stage2`
8890
compiler.
8991

90-
In theory, the `stage1` compiler is functionally identical to the `stage2`
91-
compiler, but in practice there are subtle differences. In particular, the
92-
`stage1` compiler itself was built by `stage0` and hence not by the source in
93-
your working directory. This means that the ABI generated by the `stage0`
94-
compiler may not match the ABI that would have been made by the `stage1`
95-
compiler, which can cause problems for dynamic libraries, tests, and tools using
96-
`rustc_private`.
92+
The `stage1` compiler itself was built by precompiled `stage0` compiler and std
93+
and hence not by the source in your working directory. This means that the ABI
94+
generated by the `stage0` compiler may not match the ABI that would have been made
95+
by the `stage1` compiler, which can cause problems for dynamic libraries, tests
96+
and tools using `rustc_private`.
9797

9898
Note that the `proc_macro` crate avoids this issue with a `C` FFI layer called
9999
`proc_macro::bridge`, allowing it to be used with `stage1`.
100100

101101
The `stage2` compiler is the one distributed with `rustup` and all other install
102102
methods. However, it takes a very long time to build because one must first
103103
build the new compiler with an older compiler and then use that to build the new
104-
compiler with itself. For development, you usually only want the `stage1`
105-
compiler, which you can build with `./x build library`. See [Building the
106-
compiler](../how-to-build-and-run.html#building-the-compiler).
104+
compiler with itself.
105+
106+
For development, you usually only want to use `--stage 1` flag to build things.
107+
See [Building the compiler](../how-to-build-and-run.html#building-the-compiler).
107108

108109
### Stage 3: the same-result test
109110

@@ -114,10 +115,11 @@ something has broken.
114115
### Building the stages
115116

116117
The script [`./x`] tries to be helpful and pick the stage you most likely meant
117-
for each subcommand. These defaults are as follows:
118+
for each subcommand. Here are some `x` commands with their default stages:
118119

119-
- `check`: `--stage 0`
120-
- `doc`: `--stage 0`
120+
- `check`: `--stage 1`
121+
- `clippy`: `--stage 1`
122+
- `doc`: `--stage 1`
121123
- `build`: `--stage 1`
122124
- `test`: `--stage 1`
123125
- `dist`: `--stage 2`
@@ -191,8 +193,8 @@ include, but are not limited to:
191193
without building `rustc` from source ('build with `stage0`, then test the
192194
artifacts'). If you're working on the standard library, this is normally the
193195
test command you want.
194-
- `./x build --stage 0` means to build with the beta `rustc`.
195-
- `./x doc --stage 0` means to document using the beta `rustdoc`.
196+
- `./x build --stage 0` means to build with the stage0 `rustc`.
197+
- `./x doc --stage 0` means to document using the stage0 `rustdoc`.
196198

197199
#### Examples of what *not* to do
198200

@@ -208,9 +210,6 @@ include, but are not limited to:
208210

209211
### Building vs. running
210212

211-
Note that `build --stage N compiler/rustc` **does not** build the stage N
212-
compiler: instead it builds the stage N+1 compiler _using_ the stage N compiler.
213-
214213
In short, _stage 0 uses the `stage0` compiler to create `stage0` artifacts which
215214
will later be uplifted to be the stage1 compiler_.
216215

@@ -268,23 +267,6 @@ However, when cross-compiling, `stage1` `std` will only run on the host. So the
268267

269268
(See in the table how `stage2` only builds non-host `std` targets).
270269

271-
### Why does only libstd use `cfg(bootstrap)`?
272-
273-
For docs on `cfg(bootstrap)` itself, see [Complications of
274-
Bootstrapping](#complications-of-bootstrapping).
275-
276-
The `rustc` generated by the `stage0` compiler is linked to the freshly-built
277-
`std`, which means that for the most part only `std` needs to be `cfg`-gated, so
278-
that `rustc` can use features added to `std` immediately after their addition,
279-
without need for them to get into the downloaded `beta` compiler.
280-
281-
Note this is different from any other Rust program: `stage1` `rustc` is built by
282-
the _beta_ compiler, but using the _master_ version of `libstd`!
283-
284-
The only time `rustc` uses `cfg(bootstrap)` is when it adds internal lints that
285-
use diagnostic items, or when it uses unstable library features that were
286-
recently changed.
287-
288270
### What is a 'sysroot'?
289271

290272
When you build a project with `cargo`, the build artifacts for dependencies are
@@ -459,7 +441,6 @@ compiler itself uses to run. These aren't actually used by artifacts the new
459441
compiler generates. This step also copies the `rustc` and `rustdoc` binaries we
460442
generated into `build/$HOST/stage/bin`.
461443

462-
The `stage1/bin/rustc` is a fully functional compiler, but it doesn't yet have
463-
any libraries to link built binaries or libraries to. The next 3 steps will
464-
provide those libraries for it; they are mostly equivalent to constructing the
465-
`stage1/bin` compiler so we don't go through them individually here.
444+
The `stage1/bin/rustc` is a fully functional compiler built with stage0 (precompiled) compiler and std.
445+
To use a compiler built entirely from source with the in-tree compiler and std, you need to build the
446+
stage2 compiler, which is compiled using the stage1 (in-tree) compiler and std.

src/building/how-to-build-and-run.md

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,6 @@ probably the best "go to" command for building a local compiler:
217217
This may *look* like it only builds the standard library, but that is not the case.
218218
What this command does is the following:
219219

220-
- Build `std` using the stage0 compiler
221220
- Build `rustc` using the stage0 compiler
222221
- This produces the stage1 compiler
223222
- Build `std` using the stage1 compiler
@@ -241,23 +240,22 @@ build. The **full** `rustc` build (what you get with `./x build
241240
--stage 2 compiler/rustc`) has quite a few more steps:
242241

243242
- Build `rustc` with the stage1 compiler.
244-
- The resulting compiler here is called the "stage2" compiler.
245-
- Build `std` with stage2 compiler.
243+
- The resulting compiler here is called the "stage2" compiler, which uses stage1 std from the previous command.
246244
- Build `librustdoc` and a bunch of other things with the stage2 compiler.
247245

248246
You almost never need to do this.
249247

250248
### Build specific components
251249

252250
If you are working on the standard library, you probably don't need to build
253-
the compiler unless you are planning to use a recently added nightly feature.
254-
Instead, you can just build using the bootstrap compiler.
251+
every other default component. Instead, you can build a specific component by
252+
providing its name, like this:
255253

256254
```bash
257-
./x build --stage 0 library
255+
./x build --stage 1 library
258256
```
259257

260-
If you choose the `library` profile when running `x setup`, you can omit `--stage 0` (it's the
258+
If you choose the `library` profile when running `x setup`, you can omit `--stage 1` (it's the
261259
default).
262260

263261
## Creating a rustup toolchain
@@ -271,7 +269,6 @@ you will likely need to build at some point; for example, if you want
271269
to run the entire test suite).
272270

273271
```bash
274-
rustup toolchain link stage0 build/host/stage0-sysroot # beta compiler + stage0 std
275272
rustup toolchain link stage1 build/host/stage1
276273
rustup toolchain link stage2 build/host/stage2
277274
```

src/building/new-target.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Look for existing targets to use as examples.
8585
After adding your target to the `rustc_target` crate you may want to add
8686
`core`, `std`, ... with support for your new target. In that case you will
8787
probably need access to some `target_*` cfg. Unfortunately when building with
88-
stage0 (the beta compiler), you'll get an error that the target cfg is
88+
stage0 (a precompiled compiler), you'll get an error that the target cfg is
8989
unexpected because stage0 doesn't know about the new target specification and
9090
we pass `--check-cfg` in order to tell it to check.
9191

src/building/suggested.md

Lines changed: 9 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -310,51 +310,15 @@ lets you use `cargo fmt`.
310310
[the section on vscode]: suggested.md#configuring-rust-analyzer-for-rustc
311311
[the section on rustup]: how-to-build-and-run.md?highlight=rustup#creating-a-rustup-toolchain
312312

313-
## Faster builds with `--keep-stage`.
314-
315-
Sometimes just checking whether the compiler builds is not enough. A common
316-
example is that you need to add a `debug!` statement to inspect the value of
317-
some state or better understand the problem. In that case, you don't really need
318-
a full build. By bypassing bootstrap's cache invalidation, you can often get
319-
these builds to complete very fast (e.g., around 30 seconds). The only catch is
320-
this requires a bit of fudging and may produce compilers that don't work (but
321-
that is easily detected and fixed).
322-
323-
The sequence of commands you want is as follows:
324-
325-
- Initial build: `./x build library`
326-
- As [documented previously], this will build a functional stage1 compiler as
327-
part of running all stage0 commands (which include building a `std`
328-
compatible with the stage1 compiler) as well as the first few steps of the
329-
"stage 1 actions" up to "stage1 (sysroot stage1) builds std".
330-
- Subsequent builds: `./x build library --keep-stage 1`
331-
- Note that we added the `--keep-stage 1` flag here
332-
333-
[documented previously]: ./how-to-build-and-run.md#building-the-compiler
334-
335-
As mentioned, the effect of `--keep-stage 1` is that we just _assume_ that the
336-
old standard library can be re-used. If you are editing the compiler, this is
337-
almost always true: you haven't changed the standard library, after all. But
338-
sometimes, it's not true: for example, if you are editing the "metadata" part of
339-
the compiler, which controls how the compiler encodes types and other states
340-
into the `rlib` files, or if you are editing things that wind up in the metadata
341-
(such as the definition of the MIR).
342-
343-
**The TL;DR is that you might get weird behavior from a compile when using
344-
`--keep-stage 1`** -- for example, strange [ICEs](../appendix/glossary.html#ice)
345-
or other panics. In that case, you should simply remove the `--keep-stage 1`
346-
from the command and rebuild. That ought to fix the problem.
347-
348-
You can also use `--keep-stage 1` when running tests. Something like this:
349-
350-
- Initial test run: `./x test tests/ui`
351-
- Subsequent test run: `./x test tests/ui --keep-stage 1`
352-
353-
### Iterating the standard library with `--keep-stage`
354-
355-
If you are making changes to the standard library, you can use `./x build
356-
--keep-stage 0 library` to iteratively rebuild the standard library without
357-
rebuilding the compiler.
313+
## Faster Builds with CI-rustc
314+
315+
If you are not working on the compiler, you often don't need to build the compiler tree.
316+
For example, you can skip building the compiler and only build the `library` tree or the
317+
tools under `src/tools`. To achieve that, you have to enable this by setting the `download-rustc`
318+
option in your configuration. This tells bootstrap to use the latest nightly compiler for `stage > 0`
319+
steps, meaning it will have two precompiled compilers: stage0 compiler and `download-rustc` compiler
320+
for `stage > 0` steps. This way, it will never need to build the in-tree compiler. As a result, your
321+
build time will be significantly reduced by not building the in-tree compiler.
358322

359323
## Using incremental compilation
360324

src/tests/ci.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ kinds of builds (sets of jobs).
6666
### Pull Request builds
6767

6868
After each push to a pull request, a set of `pr` jobs are executed. Currently,
69-
these execute the `x86_64-gnu-llvm-X`, `x86_64-gnu-tools`, `mingw-check` and
70-
`mingw-check-tidy` jobs, all running on Linux. These execute a relatively short
71-
(~30 minutes) and lightweight test suite that should catch common issues. More
69+
these execute the `x86_64-gnu-llvm-X`, `x86_64-gnu-tools`, `mingw-check-1`, `mingw-check-2`
70+
and `mingw-check-tidy` jobs, all running on Linux. These execute a relatively short
71+
(~40 minutes) and lightweight test suite that should catch common issues. More
7272
specifically, they run a set of lints, they try to perform a cross-compile check
7373
build to Windows mingw (without producing any artifacts) and they test the
7474
compiler using a *system* version of LLVM. Unfortunately, it would take too many

0 commit comments

Comments
 (0)