Skip to content

Rollup of 2 pull requests#147537

Merged
bors merged 9 commits intorust-lang:masterfrom
matthiaskrgr:rollup-2mfhpg4
Oct 10, 2025
Merged

Rollup of 2 pull requests#147537
bors merged 9 commits intorust-lang:masterfrom
matthiaskrgr:rollup-2mfhpg4

Conversation

@matthiaskrgr
Copy link
Member

@matthiaskrgr matthiaskrgr commented Oct 9, 2025 •
edited by rustbot
Loading

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

folkertdev and others added 9 commits October 8, 2025 13:25
@folkertdev
cmse: additional impl Trait tests
f62be66
@folkertdev
cmse: more accurate spans for excess parameters
f4d8bd3 
Use the span of the types that don't fit, rather than the span of the
whole signature.
@folkertdev
cmse: rephrase error message when types don't fit
b47de64
@folkertdev
cmse: rephrase error message when signature uses generics
98d3864
@folkertdev
cmse: more accurate span for generic arguments
760ea07
@folkertdev
cmse: simplify input/output check control flow
bd5f908
@krasimirgg
x86_64-bigint-helpers test: update test assertion
71c0533
@matthiaskrgr
Rollup merge of rust-lang#147479 - folkertdev:cmse-refactor-warnings,…
802f722 
… r=davidtwco

cmse: improve error messages

tracking issue: rust-lang#81391
tracking issue: rust-lang#75835

Improves the cmse error messages (e.g. by using more accurate spans), and attempts to clean up the control flow a bit. This is partially in preparation for one final addition: warnings when `union` types or types with niches cross the security boundary. That will be a folllow-up.

Meant to be reviewed commit-by-commit

r? ``@davidtwco``
@matthiaskrgr
Rollup merge of rust-lang#147523 - krasimirgg:llvm22-rr, r=durin42
849bea3 
x86_64-bigint-helpers test: update test assertion to cover registers r8 and r9

Adapts the test expectation to cover the case where a register like `r9` is chosen. Update is similar to the other such expectation in the previous function in the same test file.

Found by our experimental rust + LLVM @ HEAD bot:
https://buildkite.com/llvm-project/rust-llvm-integrate-prototype/builds/40528/steps/canvas?sid=0199c8d7-f65a-4bbc-8d7f-e62d4ddcc65e#0199c8d7-f7ab-464d-a0fd-b4b8862a11d3/1047-1175

r? durin42
``@rustbot`` label: +llvm-main
@matthiaskrgr
Copy link
Member Author

matthiaskrgr commented Oct 9, 2025

@bors r+ rollup=never p=5

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Oct 9, 2025
@matthiaskrgr
Copy link
Member Author

matthiaskrgr commented Oct 9, 2025

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Oct 9, 2025

📌 Commit 849bea3 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 Oct 9, 2025
@bors
Copy link
Collaborator

bors commented Oct 9, 2025

⌛ Testing commit 849bea3 with merge 9725c4b...

@bors
Copy link
Collaborator

bors commented Oct 10, 2025

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 10, 2025
@bors bors merged commit 9725c4b into rust-lang:master Oct 10, 2025
11 checks passed
@rustbot rustbot added this to the 1.92.0 milestone Oct 10, 2025
@rust-timer
Copy link
Collaborator

rust-timer commented Oct 10, 2025

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#147479 cmse: improve error messages 34a5630ab028f7e8ae8d3e6c553d07a1ff0150d6 (link)
#147523 x86_64-bigint-helpers test: update test assertion to cover … bb818ed1bdd7d165c75abc6f4ced153abc0c8b60 (link)

previous master: b925a865e2

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
Contributor

github-actions bot commented Oct 10, 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 b925a86 (parent) -> 9725c4b (this PR)

Test differences

No test diffs found

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 9725c4baacef19345e13f91b27e66e10ef5592ae --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: 10276.7s -> 7698.4s (-25.1%)
  2. dist-aarch64-msvc: 5384.7s -> 6167.9s (14.5%)
  3. dist-apple-various: 4556.2s -> 3912.6s (-14.1%)
  4. dist-ohos-aarch64: 4830.4s -> 4195.2s (-13.1%)
  5. dist-x86_64-apple: 6673.7s -> 7535.0s (12.9%)
  6. dist-ohos-x86_64: 4780.5s -> 4224.1s (-11.6%)
  7. x86_64-gnu-miri: 4407.7s -> 4009.5s (-9.0%)
  8. dist-armv7-linux: 4807.6s -> 5231.2s (8.8%)
  9. dist-aarch64-apple: 8371.7s -> 7683.7s (-8.2%)
  10. aarch64-gnu: 6518.8s -> 6999.5s (7.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

rust-timer commented Oct 10, 2025

Finished benchmarking commit (9725c4b): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

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

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -0.0% [-0.1%, -0.0%] 2
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary 3.2%, secondary 0.2%)

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

mean range count
Regressions ❌
(primary)		 3.2% [2.7%, 3.7%] 2
Regressions ❌
(secondary)		 1.3% [1.3%, 1.3%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -0.9% [-0.9%, -0.9%] 1
All ❌✅ (primary) 3.2% [2.7%, 3.7%] 2

Cycles

Results (secondary 0.6%)

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

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

Binary size

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

Bootstrap: 472.277s -> 472.692s (0.09%)
Artifact size: 388.06 MiB -> 388.03 MiB (-0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

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-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.92.0

Development

Successfully merging this pull request may close these issues.

6 participants

@matthiaskrgr @bors @rust-timer @rustbot @folkertdev @krasimirgg