Skip to content

Commit 1d82e1e

Browse files
authored
Merge pull request #2477 from rust-lang/rustc-pull
Rustc pull update
2 parents 4c6d66c + 4f0329b commit 1d82e1e

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14346303d760027e53214e705109a62c0f00b214
1+
d1d8e386c5e84c4ba857f56c3291f73c27e2d62a

src/building/bootstrapping/writing-tools-in-bootstrap.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ There are three types of tools you can write in bootstrap:
44

55
- **`Mode::ToolBootstrap`**
66
Use this for tools that don’t need anything from the in-tree compiler and can run with the stage0 `rustc`.
7-
The output is placed in the "stage0-bootstrap-tools" directory. This mode is for general-purpose tools built
7+
The output is placed in the "bootstrap-tools" directory. This mode is for general-purpose tools built
88
entirely with the stage0 compiler, including target libraries and only works for stage 0.
99

1010
- **`Mode::ToolStd`**

src/implementing_new_features.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ a new unstable feature:
156156
[`incomplete_features` lint]: https://doc.rust-lang.org/rustc/lints/listing/warn-by-default.html#incomplete-features
157157

158158
```rust ignore
159-
/// Allows unsized rvalues at arguments and parameters.
160-
(incomplete, unsized_locals, "CURRENT_RUSTC_VERSION", Some(48055), None),
159+
/// Allows deref patterns.
160+
(incomplete, deref_patterns, "CURRENT_RUSTC_VERSION", Some(87121), None),
161161
```
162162

163163
To avoid [semantic merge conflicts], please use `CURRENT_RUSTC_VERSION` instead of `1.70` or

src/tests/ui.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,8 @@ Compiletest makes the following replacements on the compiler output:
113113
- The base directory where the test's output goes is replaced with
114114
`$TEST_BUILD_DIR`. This only comes up in a few rare circumstances. Example:
115115
`/path/to/rust/build/x86_64-unknown-linux-gnu/test/ui`
116+
- The real directory to the standard library source is replaced with `$SRC_DIR_REAL`.
117+
- The real directory to the compiler source is replaced with `$COMPILER_DIR_REAL`.
116118
- Tabs are replaced with `\t`.
117119
- Backslashes (`\`) are converted to forward slashes (`/`) within paths (using a
118120
heuristic). This helps normalize differences with Windows-style paths.

0 commit comments

Comments
 (0)