Skip to content

Commit 50d5940

Browse files
committed
Auto merge of #150633 - JonathanBrouwer:rollup-lfp28cm, r=JonathanBrouwer
Rollup of 2 pull requests Successful merges: - #150627 (Add diagnostic items for `without_provenance` and `without_provenance_mut`) - #150632 (rustc-dev-guide subtree update) r? `@ghost` `@rustbot` modify labels: rollup
2 parents e8f3cfc + d00729b commit 50d5940

File tree

10 files changed

+20
-14
lines changed

10 files changed

+20
-14
lines changed

compiler/rustc_span/src/symbol.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1788,6 +1788,8 @@ symbols! {
17881788
ptr_slice_from_raw_parts_mut,
17891789
ptr_swap,
17901790
ptr_swap_nonoverlapping,
1791+
ptr_without_provenance,
1792+
ptr_without_provenance_mut,
17911793
ptr_write,
17921794
ptr_write_bytes,
17931795
ptr_write_unaligned,

library/core/src/ptr/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -880,6 +880,7 @@ pub const fn null_mut<T: PointeeSized + Thin>() -> *mut T {
880880
#[must_use]
881881
#[stable(feature = "strict_provenance", since = "1.84.0")]
882882
#[rustc_const_stable(feature = "strict_provenance", since = "1.84.0")]
883+
#[rustc_diagnostic_item = "ptr_without_provenance"]
883884
pub const fn without_provenance<T>(addr: usize) -> *const T {
884885
without_provenance_mut(addr)
885886
}
@@ -918,6 +919,7 @@ pub const fn dangling<T>() -> *const T {
918919
#[must_use]
919920
#[stable(feature = "strict_provenance", since = "1.84.0")]
920921
#[rustc_const_stable(feature = "strict_provenance", since = "1.84.0")]
922+
#[rustc_diagnostic_item = "ptr_without_provenance_mut"]
921923
#[allow(integer_to_ptr_transmutes)] // Expected semantics here.
922924
pub const fn without_provenance_mut<T>(addr: usize) -> *mut T {
923925
// An int-to-pointer transmute currently has exactly the intended semantics: it creates a

src/doc/rustc-dev-guide/.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

src/doc/rustc-dev-guide/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!();
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2dc30247c5d8293aaa31e1d7dae2ed2fde908ada
1+
85c8ff69cb3efd950395cc444a54bbbdad668865

src/doc/rustc-dev-guide/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/doc/rustc-dev-guide/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/doc/rustc-dev-guide/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

src/doc/rustc-dev-guide/src/tests/perf.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ To evaluate the performance impact of a PR, write this comment on the PR:
4141
> repository](https://github.com/rust-lang/team) with the `perf = true` value in
4242
> the `[permissions]` section (and bors permissions are also required). If you
4343
> are not on one of those teams, feel free to ask for someone to post it for you
44-
> (either on Zulip or ask the assigned reviewer).
44+
> (either on [Zulip][perf run] or ask the assigned reviewer).
45+
46+
[perf run]: https://rust-lang.zulipchat.com/#narrow/channel/182449-t-compiler.2Fhelp/topic/perf.20run
4547

4648
This will first tell bors to do a "try" build which do a full release build for
4749
`x86_64-unknown-linux-gnu`. After the build finishes, it will place it in the

src/doc/rustc-dev-guide/triagebot.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,6 @@ allow-unauthenticated = [
5858
# Documentation at: https://forge.rust-lang.org/triagebot/issue-links.html
5959
[issue-links]
6060

61-
[behind-upstream]
62-
days-threshold = 7
63-
6461
# Enable triagebot (PR) assignment.
6562
# Documentation at: https://forge.rust-lang.org/triagebot/pr-assignment.html
6663
[assign]

0 commit comments

Comments
 (0)