Skip to content

Commit 18bc3fd

Browse files
authored
Merge pull request #21419 from rust-lang/rustc-pull
Rustc pull update
2 parents 8e4cdba + 3e5114f commit 18bc3fd

14 files changed

Lines changed: 27 additions & 23 deletions

File tree

.github/workflows/date-check.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ jobs:
2222
rustup update stable
2323
2424
- name: Run `date-check`
25-
working-directory: ci/date-check
26-
run: |
27-
cargo run -- ../../src/ > ../../date-check-output.txt
25+
run: cargo run --manifest-path ci/date-check/Cargo.toml . > date-check-output.txt
2826

2927
- name: Open issue
3028
uses: actions/github-script@v7

ci/date-check/src/main.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,13 @@ fn main() {
153153
println!();
154154

155155
for (path, dates) in dates_by_file {
156-
println!("- {}", path.strip_prefix(&root_dir_path).unwrap_or(&path).display(),);
156+
let path = path.strip_prefix(&root_dir_path).unwrap_or(&path).display();
157+
println!("- {path}");
157158
for (line, date) in dates {
158-
println!(" - [ ] line {}: {}", line, date);
159+
let url = format!(
160+
"https://github.com/rust-lang/rustc-dev-guide/blob/main/{path}?plain=1#L{line}"
161+
);
162+
println!(" - [ ] {date} [line {line}]({url})");
159163
}
160164
}
161165
println!();

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2dc30247c5d8293aaa31e1d7dae2ed2fde908ada
1+
85c8ff69cb3efd950395cc444a54bbbdad668865

src/SUMMARY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
- [Parallel compilation](./parallel-rustc.md)
101101
- [Rustdoc internals](./rustdoc-internals.md)
102102
- [Search](./rustdoc-internals/search.md)
103-
- [The `rustdoc` test suite](./rustdoc-internals/rustdoc-test-suite.md)
103+
- [The `rustdoc-html` test suite](./rustdoc-internals/rustdoc-html-test-suite.md)
104104
- [The `rustdoc-gui` test suite](./rustdoc-internals/rustdoc-gui-test-suite.md)
105105
- [The `rustdoc-json` test suite](./rustdoc-internals/rustdoc-json-test-suite.md)
106106
- [GPU offload internals](./offload/internals.md)

src/getting-started.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ The following tasks are doable without much background knowledge but are incredi
179179
to read a part of the code and write doc comments for it.
180180
This will help you to learn some part of the compiler while also producing a useful artifact!
181181
- [Triaging issues][triage]: categorizing, replicating, and minimizing issues is very helpful to the Rust maintainers.
182-
- [Working groups][wg]: there are a bunch of working groups on a wide variety
182+
- [Working areas][wa]: there are a bunch of working areas on a wide variety
183183
of rust-related things.
184184
- Answer questions on [users.rust-lang.org][users], or on [Stack Overflow][so].
185185
- Participate in the [RFC process](https://github.com/rust-lang/rfcs).
@@ -191,7 +191,7 @@ The following tasks are doable without much background knowledge but are incredi
191191
[so]: http://stackoverflow.com/questions/tagged/rust
192192
[community-library]: https://github.com/rust-lang/rfcs/labels/A-community-library
193193
[wd]: ./contributing.md#writing-documentation
194-
[wg]: https://rust-lang.github.io/compiler-team/working-groups/
194+
[wa]: https://forge.rust-lang.org/compiler/working-areas.html
195195
[triage]: ./contributing.md#issue-triage
196196

197197
## Cloning and Building

src/offload/usage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ fn main() {
5757

5858
#[inline(never)]
5959
unsafe fn kernel(x: *mut [f64; 256]) {
60-
core::intrinsics::offload(kernel_1, (x,))
60+
core::intrinsics::offload(_kernel_1, [256, 1, 1], [32, 1, 1], (x,))
6161
}
6262

6363
#[cfg(target_os = "linux")]

src/overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ preserves full fidelity information for both IDEs and procedural macros
5050
The *parser* [translates the token stream from the `lexer` into an Abstract Syntax
5151
Tree (AST)][parser]. It uses a recursive descent (top-down) approach to syntax
5252
analysis. The crate entry points for the `parser` are the
53-
[`Parser::parse_crate_mod()`][parse_crate_mod] and [`Parser::parse_mod()`][parse_mod]
53+
[`Parser::parse_crate_mod`][parse_crate_mod] and [`Parser::parse_mod`][parse_mod]
5454
methods found in [`rustc_parse::parser::Parser`]. The external module parsing
5555
entry point is [`rustc_expand::module::parse_external_mod`][parse_external_mod].
56-
And the macro-`parser` entry point is [`Parser::parse_nonterminal()`][parse_nonterminal].
56+
And the macro-`parser` entry point is [`Parser::parse_nonterminal`][parse_nonterminal].
5757

5858
Parsing is performed with a set of [`parser`] utility methods including [`bump`],
5959
[`check`], [`eat`], [`expect`], [`look_ahead`].

src/rustdoc-internals/rustdoc-test-suite.md renamed to src/rustdoc-internals/rustdoc-html-test-suite.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# The `rustdoc` test suite
1+
# The `rustdoc-html` test suite
22

3-
This page is about the test suite named `rustdoc` used to test the HTML output of `rustdoc`.
3+
This page is about the test suite named `rustdoc-html` used to test the HTML output of `rustdoc`.
44
For other rustdoc-specific test suites, see [Rustdoc test suites].
55

66
Each test file in this test suite is simply a Rust source file `file.rs` sprinkled with

src/rustdoc-internals/rustdoc-json-test-suite.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Also, talk about how it works
2424
## jsondocck
2525

2626
[jsondocck] processes directives given in comments, to assert that the values in the output are expected.
27-
It's a lot like [htmldocck](./rustdoc-test-suite.md) in that way.
27+
It's a lot like [htmldocck](./rustdoc-html-test-suite.md) in that way.
2828

2929
It uses [JSONPath] as a query language, which takes a path, and returns a *list* of values that that path is said to match to.
3030

src/tests/best-practices.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ This may include remarks on:
153153
- Try to make sure the test is as minimal as possible.
154154
- Minimize non-critical code and especially minimize unnecessary syntax and type
155155
errors which can clutter stderr snapshots.
156+
- Use `#![allow(...)]` or `#![expect(...)]` to suppress unrelated warnings.
156157
- Where possible, use semantically meaningful names (e.g. `fn
157158
bare_coverage_attributes() {}`).
158159

0 commit comments

Comments
 (0)