Skip to content

Rollup of 6 pull requests - #147197

Merged
bors merged 16 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-du5e4pv
Sep 30, 2025
Merged

Rollup of 6 pull requests#147197
bors merged 16 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-du5e4pv

Conversation

@matthiaskrgr

@matthiaskrgrmatthiaskrgr commented Sep 30, 2025

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

clarfontheyand others added 16 commits September 4, 2025 20:07
All of the docs need to be built with the same rustdoc. Otherwise,
any change to the search index breaks everything, because the two
rustdocs don't agree on the format.
…oboet
Add `Path::has_trailing_sep` and related methods
Implements rust-lang/libs-team#335.
Tracking issue: rust-lang#142503
Notable differences from ACP:
* `trim_trailing_sep` was added to `Path` since it felt reasonable to ensure that the inverse operation was available.
* Per suggestion of `@kennytm,` added `push_trailing_sep` and `pop_trailing_sep` to `PathBuf` in addition to `set_trailing_sep`.
This also updates some of the docs on various `Path` methods to use the term "trailing separator" instead of "trailing slash" for consistency.
…ulacrum
Add repr(align(2)) to RcInner and ArcInner
`Rc` currently assumes that `RcInner` has at least 2-byte alignment, but on AVR, `usize` has 1-byte alignment (this is because the AVR has 1-byte register sizes, so having 2-byte alignment is generally useless), breaking this assumption.
https://github.com/rust-lang/rust/blob/9f32ccf35fb877270bc44a86a126440f04d676d0/library/alloc/src/rc.rs#L3005-L3008
This PR adds `repr(align(2))` to force `RcInner` to always have at least 2-byte alignment.
Note that `ArcInner` doesn't need `repr(align(2))` because atomic types have the alignment same as its size. This PR adds a comment about this.
…trochenkov
several small `proc_macro` cleanups
bootstrap: build bootstrap docs with in-tree rustdoc
All of the docs need to be built with the same rustdoc. Otherwise, any change to the search index breaks everything, because the two rustdocs don't agree on the format.
Fixesrust-lang#147142
…enkov
cg_llvm: Replace enum `MetadataType` with a list of `MetadataKindId` constants
The metadata kind ID values declared in `MetadataType` are not part of the LLVM-C API, and are not machine-checked. If a value that we use ever goes out of sync with LLVM, the resulting bugs could be difficult to track down. And the existing values lack any clear indication of what LLVM declarations they correspond to.
On top of that, we currently have another way of expressing metadata kind IDs in the form of `MetadataKindId`, which creates confusing inconsistency in LLVM bindings.
This PR therefore consolidates all usage of “fixed” metadata kind IDs into one list of `MetadataKindId` constants, which is backed by static assertions in our C++ code that match them up with named anonymous-enum variants in `llvm::LLVMContext`.
remove unnecessary test directives
that's... odd
@rustbotrustbot added A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. 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. T-libs Relevant to the library team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Sep 30, 2025
@matthiaskrgr

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=5

@bors

bors commented Sep 30, 2025

Copy link
Copy Markdown
Collaborator

📌 Commit 561e02c has been approved by matthiaskrgr

It is now in the queue for this repository.

@borsbors 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 Sep 30, 2025
@bors

bors commented Sep 30, 2025

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 561e02c with merge fa3155a...

@bors

bors commented Sep 30, 2025

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Sep 30, 2025
@bors
bors merged commit fa3155a into rust-lang:masterSep 30, 2025
11 checks passed
@rustbotrustbot added this to the 1.92.0 milestone Sep 30, 2025
@rust-timer

Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR#MessagePerf Build Sha
#142506Add Path::has_trailing_sep and related methodsb747b95a1bede47caaab3f5274a00e35e0e645d3 (link)
#146886Add repr(align(2)) to RcInner and ArcInnerfd1d9c503eaa49aa3f8a9ab3ba0b1ab6f65e636f (link)
#147166several small proc_macro cleanupsea9de337e1e2807767e11b2b87be8923679eb3ae (link)
#147172bootstrap: build bootstrap docs with in-tree rustdoc75f3c2dff016c423d80ed06656b619ddf1404399 (link)
#147181cg_llvm: Replace enum MetadataType with a list of `Metada…75fd78fd6fd0fc02984776e820e1d37c3ae086e7 (link)
#147187remove unnecessary test directives1a7e1ed2dc5a79064e438e9c0319cb49729db332 (link)

previous master: 42d009c0a9

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

@github-actions

Copy link
Copy Markdown
Contributor
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 42d009c (parent) -> fa3155a (this PR)

Test differences

Show 956 test diffs

Stage 1

  • test_trim_trailing_sep: [missing] -> pass (J1)

Stage 2

  • test_trim_trailing_sep: [missing] -> pass (J0)

Additionally, 954 doctest diffs were found. These are ignored, as they are noisy.

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
test-dashboard fa3155a644dd62e865825087b403646be01d4cef --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. aarch64-apple: 9724.7s -> 7696.6s (-20.9%)
  2. aarch64-msvc-2: 5035.0s -> 5967.7s (18.5%)
  3. x86_64-gnu-llvm-20: 2715.2s -> 2282.6s (-15.9%)
  4. x86_64-gnu-llvm-20-2: 6378.9s -> 5534.5s (-13.2%)
  5. aarch64-gnu-llvm-20-1: 3743.5s -> 3300.0s (-11.8%)
  6. x86_64-rust-for-linux: 3035.0s -> 2684.1s (-11.6%)
  7. dist-armhf-linux: 5242.8s -> 4647.4s (-11.4%)
  8. dist-various-1: 3940.8s -> 4376.8s (11.1%)
  9. x86_64-gnu-llvm-20-1: 3656.1s -> 3273.1s (-10.5%)
  10. test-various: 4885.7s -> 4395.4s (-10.0%)
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
Copy Markdown
Collaborator

Finished benchmarking commit (fa3155a): comparison URL.

Overall result: ❌✅ regressions and improvements - please read the text below

Our benchmarks found a performance regression caused by this PR.
This might be an actual regression, but it can also be just noise.

Next Steps:

  • If the regression was expected or you think it can be justified,
    please write a comment with sufficient written justification, and add
    @rustbot label: +perf-regression-triaged to it, to mark the regression as triaged.
  • If you think that you know of a way to resolve the regression, try to create
    a new PR with a fix for the regression.
  • If you do not understand the regression or you think that it is just noise,
    you can ask the @rust-lang/wg-compiler-performance working group for help (members of this group
    were already notified of this PR).

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
0.3%[0.3%, 0.3%]1
Improvements ✅
(primary)
-1.5%[-2.9%, -0.4%]3
Improvements ✅
(secondary)
-0.6%[-1.2%, -0.3%]5
All ❌✅ (primary)-1.5%[-2.9%, -0.4%]3

Max RSS (memory usage)

Results (primary -0.1%, secondary 3.1%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

meanrangecount
Regressions ❌
(primary)
3.1%[3.1%, 3.1%]1
Regressions ❌
(secondary)
3.1%[3.1%, 3.1%]1
Improvements ✅
(primary)
-3.4%[-3.4%, -3.4%]1
Improvements ✅
(secondary)
--0
All ❌✅ (primary)-0.1%[-3.4%, 3.1%]2

Cycles

Results (primary 1.5%, secondary 2.5%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

meanrangecount
Regressions ❌
(primary)
6.1%[6.1%, 6.1%]1
Regressions ❌
(secondary)
2.5%[2.5%, 2.5%]1
Improvements ✅
(primary)
-3.0%[-3.0%, -3.0%]1
Improvements ✅
(secondary)
--0
All ❌✅ (primary)1.5%[-3.0%, 6.1%]2

Binary size

Results (primary -0.3%, secondary -0.0%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
-0.3%[-1.1%, -0.0%]5
Improvements ✅
(secondary)
-0.0%[-0.0%, -0.0%]1
All ❌✅ (primary)-0.3%[-1.1%, -0.0%]5

Bootstrap: 472.044s -> 470.387s (-0.35%)
Artifact size: 387.71 MiB -> 387.74 MiB (0.01%)

@rustbotrustbot added the perf-regression Performance regression. label Sep 30, 2025
@panstromek

Copy link
Copy Markdown
Contributor

perf triage:

Improvements outweigh regressions. coercions regression also looks like noise.

@rustbot label: +perf-regression-triaged

@rustbotrustbot added the perf-regression-triaged The performance regression has been triaged. label Oct 6, 2025
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-LLVMArea: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues.merged-by-borsThis PR was explicitly merged by bors.perf-regressionPerformance regression.perf-regression-triagedThe performance regression has been triaged.rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-libsRelevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

11 participants

@matthiaskrgr@bors@rust-timer@panstromek@rustbot@clarfonthey@cyrgani@Zalathar@lcnr@taiki-e@notriddle