Skip to content

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

madsmtm and others added 18 commits March 12, 2025 22:44
It was previously normalized by LLVM to `thumbv7a-vita-unknown-eabihf`,
which is probably wrong, as Vita is the OS.
It makes it clearer that the symbol is unused and doesn't matter.
To use one `kw::Empty` instead of two. It's a little more direct this
way, and avoids `kw::Empty` being used for both "no string" and "empty
string".
This is part of the implementation of `#[doc(keyword = "match")]`
attributes used by `std` to provide documentation for keywords.

`is_doc_keyword` currently does a crude keyword range test that's
intended to catch all keywords but misses `kw::Yeet`. This commit
changes it to use `Symbol` methods, including the new `is_weak` method
(required for `union`). `Symbol` methods are much less prone to falling
out of date if new keywords are added.
By changing two of the fields to use `Option<Ident>` instead of `Ident`.
As a result, `None` now means "no identifier", which is much clearer
than using an empty identifier.
Fix `armv7-sony-vita-newlibeabihf` LLVM target triple

It was previously normalized by LLVM to `thumbv7a-vita-unknown-eabihf` (can be seen with `clang -target thumbv7a-vita-eabihf -v`), which seems wrong, as Vita is the OS name.

Motivation: To make it easier to verify that [`cc-rs`' conversion from `rustc` to Clang/LLVM triples](rust-lang/cc-rs#1431) is correct.

CC target maintainers ``@nikarh,`` ``@pheki`` and ``@ZetaNumbers.``
r? jieyouxu
…iser

rustc_resolve: Test the order that preludes are resolved

This test is exhaustive. See attached truth table:
![image](https://github.com/user-attachments/assets/11fe703c-e114-48df-84f8-426b63395784)

Companion PR to rust-lang/reference#1765.
…rochenkov

Reduce kw::Empty usage, part 4

Another step towards rust-lang#137978.

r? `@petrochenkov`
…zkan

tidy: properly check for orphaned unstable_book pages

This also recommends using underscores - something that took me a little bit too long to figure out.

Note: this PR deletes the page `src/doc/unstable-book/src/library-features/c-variadic.md`. The page `src/doc/unstable-book/src/lang-features/c-variadic.md` remains.
Remove fragile equal-pointers-unequal/*/print3.rs tests.

These tests were added in rust-lang#127003

The print3.rs tests stop working when I change implementation details of format_args!(). (For example, in rust-lang#139175 and rust-lang#139135). These tests shouldn't rely on such implementation details. It gets in the way for format_args!() improvements.

If they test anything that aren't already covered by the other tests in this directory, they should be expressed in a less fragile way that doesn't rely on internal details of format_args!().

cc ``@GrigorenkoPV,`` author of these tests.
@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-tidy Area: The tidy tool S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Mar 31, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Mar 31, 2025

📌 Commit d492348 has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 31, 2025
@bors
Copy link
Collaborator

bors commented Apr 1, 2025

⌛ Testing commit d492348 with merge 97ea17b...

@bors
Copy link
Collaborator

bors commented Apr 1, 2025

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 97ea17b to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 1, 2025
@bors bors merged commit 97ea17b into rust-lang:master Apr 1, 2025
7 checks passed
@rustbot rustbot added this to the 1.88.0 milestone Apr 1, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#138426 Fix armv7-sony-vita-newlibeabihf LLVM target triple 25f9c7ee9799fffb216cbd29e339ac8a81fd4bfc (link)
#138840 rustc_resolve: Test the order that preludes are resolved 27163cef3a01539cbe94d35acf89cd7d353ca2db (link)
#139039 Reduce kw::Empty usage, part 4 79d9f1aab0bb67b3b549bd88f07fd2c7672376d9 (link)
#139151 tidy: properly check for orphaned unstable_book pages 1e01659fb248c4456918739fbc8807b679fdea4e (link)
#139176 Remove fragile equal-pointers-unequal/*/print3.rs tests. 70ee050ed4a93cc8c95ce72d5218b43c2195f700 (link)
#139179 Remove me from vacation b48451a412c6cd115ee6671732daaf0114a69998 (link)
#139181 Fix invalid link in docs 48fee90e3e84d3f03feab311a3abae39b13101f0 (link)

previous master: 0b45675cfc

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

Copy link
Contributor

github-actions bot commented Apr 1, 2025

What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 0b45675 (parent) -> 97ea17b (this PR)

Test differences

Show 8 test diffs

Stage 1

  • [ui] tests/ui/codegen/equal-pointers-unequal/as-cast/print3.rs: pass -> [missing] (J1)
  • [ui] tests/ui/codegen/equal-pointers-unequal/exposed-provenance/print3.rs: pass -> [missing] (J1)
  • [ui] tests/ui/codegen/equal-pointers-unequal/strict-provenance/print3.rs: pass -> [missing] (J1)
  • [ui] tests/ui/resolve/prelude-order.rs: [missing] -> pass (J1)

Stage 2

  • [ui] tests/ui/codegen/equal-pointers-unequal/as-cast/print3.rs: pass -> [missing] (J0)
  • [ui] tests/ui/codegen/equal-pointers-unequal/exposed-provenance/print3.rs: pass -> [missing] (J0)
  • [ui] tests/ui/codegen/equal-pointers-unequal/strict-provenance/print3.rs: pass -> [missing] (J0)
  • [ui] tests/ui/resolve/prelude-order.rs: [missing] -> pass (J0)

Job group index

  • J0: aarch64-apple, aarch64-gnu, arm-android, armhf-gnu, dist-i586-gnu-i586-i686-musl, i686-gnu-1, i686-gnu-nopt-1, i686-msvc-1, test-various, x86_64-apple-2, x86_64-gnu, x86_64-gnu-llvm-18-1, x86_64-gnu-llvm-18-2, x86_64-gnu-llvm-19-1, x86_64-gnu-llvm-19-2, x86_64-gnu-nopt, x86_64-gnu-stable, x86_64-mingw-1, x86_64-msvc-1
  • J1: x86_64-gnu-llvm-18-3, x86_64-gnu-llvm-19-3

Job duration changes

  1. dist-apple-various: 6539.1s -> 7149.7s (9.3%)
  2. x86_64-apple-2: 4885.6s -> 5298.3s (8.4%)
  3. aarch64-gnu-debug: 5925.9s -> 6323.4s (6.7%)
  4. x86_64-gnu-llvm-18-3: 6686.8s -> 7018.0s (5.0%)
  5. x86_64-msvc-2: 6816.1s -> 7106.9s (4.3%)
  6. i686-gnu-1: 8533.8s -> 8857.9s (3.8%)
  7. x86_64-gnu-aux: 5959.9s -> 6186.3s (3.8%)
  8. dist-ohos: 10134.6s -> 10483.6s (3.4%)
  9. dist-x86_64-illumos: 5585.6s -> 5732.7s (2.6%)
  10. x86_64-gnu-llvm-19-1: 5319.9s -> 5446.1s (2.4%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (97ea17b): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
0.8% [0.8%, 0.8%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary 1.5%, secondary -3.2%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
1.5% [1.5%, 1.5%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-3.2% [-3.3%, -3.1%] 2
All ❌✅ (primary) 1.5% [1.5%, 1.5%] 1

Cycles

Results (secondary 3.5%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
3.5% [3.5%, 3.5%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 773.955s -> 773.194s (-0.10%)
Artifact size: 365.96 MiB -> 366.00 MiB (0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-attributes Area: Attributes (`#[…]`, `#![…]`) A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-tidy Area: The tidy tool merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.