mirror
/
rustc-dev-guide
mirror of https://github.com/rust-lang/rustc-dev-guide.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge from rustc

This commit is contained in:
The rustc-dev-guide Cronjob Bot 2025-06-19 04:07:39 +00:00
parent c6bbfe0945 390d647aec
commit 4f0329bb19
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/building/bootstrapping/writing-tools-in-bootstrap.md
View File

@ -4,7 +4,7 @@ There are three types of tools you can write in bootstrap:
- **`Mode::ToolBootstrap`** - **`Mode::ToolBootstrap`**
Use this for tools that don’t need anything from the in-tree compiler and can run with the stage0 `rustc`. Use this for tools that don’t need anything from the in-tree compiler and can run with the stage0 `rustc`.
The output is placed in the "stage0-bootstrap-tools" directory. This mode is for general-purpose tools built The output is placed in the "bootstrap-tools" directory. This mode is for general-purpose tools built
entirely with the stage0 compiler, including target libraries and only works for stage 0. entirely with the stage0 compiler, including target libraries and only works for stage 0.
- **`Mode::ToolStd`** - **`Mode::ToolStd`**

4
src/implementing_new_features.md
View File

@ -156,8 +156,8 @@ a new unstable feature:
[`incomplete_features` lint]: https://doc.rust-lang.org/rustc/lints/listing/warn-by-default.html#incomplete-features [`incomplete_features` lint]: https://doc.rust-lang.org/rustc/lints/listing/warn-by-default.html#incomplete-features
```rust ignore ```rust ignore
/// Allows unsized rvalues at arguments and parameters. /// Allows deref patterns.
(incomplete, unsized_locals, "CURRENT_RUSTC_VERSION", Some(48055), None), (incomplete, deref_patterns, "CURRENT_RUSTC_VERSION", Some(87121), None),
``` ```
To avoid [semantic merge conflicts], please use `CURRENT_RUSTC_VERSION` instead of `1.70` or To avoid [semantic merge conflicts], please use `CURRENT_RUSTC_VERSION` instead of `1.70` or

2
src/tests/ui.md
View File

@ -113,6 +113,8 @@ Compiletest makes the following replacements on the compiler output:
- The base directory where the test's output goes is replaced with - The base directory where the test's output goes is replaced with
`$TEST_BUILD_DIR`. This only comes up in a few rare circumstances. Example: `$TEST_BUILD_DIR`. This only comes up in a few rare circumstances. Example:
`/path/to/rust/build/x86_64-unknown-linux-gnu/test/ui` `/path/to/rust/build/x86_64-unknown-linux-gnu/test/ui`
- The real directory to the standard library source is replaced with `$SRC_DIR_REAL`.
- The real directory to the compiler source is replaced with `$COMPILER_DIR_REAL`.
- Tabs are replaced with `\t`. - Tabs are replaced with `\t`.
- Backslashes (`\`) are converted to forward slashes (`/`) within paths (using a - Backslashes (`\`) are converted to forward slashes (`/`) within paths (using a
heuristic). This helps normalize differences with Windows-style paths. heuristic). This helps normalize differences with Windows-style paths.