Skip to content

Rollup of 2 pull requests #148136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 4 commits into from
Oct 26, 2025
Merged

Rollup of 2 pull requests #148136

merged 4 commits into from
Oct 26, 2025
+20 −2

Conversation

@Zalathar
Copy link
Contributor

@Zalathar Zalathar commented Oct 26, 2025 •
edited by rustbot
Loading

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

saethlin and others added 4 commits October 25, 2025 21:32
@saethlin
Improve the ICE message for invalid nullary intrinsic calls
7a0d9c8
@Fulgen301
Add myself as a windows-msvc maintainer
e873f13
@Zalathar
Rollup merge of rust-lang#148118 - saethlin:nullary-intrinsic-check-b…
3bf838d 
…ug-msg, r=Noratrieb,dianqk

Improve the ICE message for invalid nullary intrinsic calls

In rust-lang#148104, we found the panic message here rather confusing, and (if I'm reading the tea leaves right) that's because the intended audience for either side of the phrase is very different. I think this is more clear if/when this is encountered by users.

I expect this ICE to be hit in practice by people calling the `size_of` and `align_of` intrinsics, so it's now _kind of_ helpful for those users too.

The original effort to stop backends from needing to support nullary intrinsics added a note to all these const-only intrinsics, but when rust-lang#147793 ported two more the paragraph wasn't added. I've added it.
@Zalathar
Rollup merge of rust-lang#148134 - Fulgen301:maintainer, r=Noratrieb
cdacfb8 
Add myself as a windows-msvc maintainer

As mentioned on the RPLCS Discord, I'd like to become a maintainer for windows-msvc.

r? `@jieyouxu`
@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. T-libs Relevant to the library team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Oct 26, 2025
@Zalathar
Copy link
Contributor Author

Rollup of everything.

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Oct 26, 2025

📌 Commit cdacfb8 has been approved by Zalathar

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 26, 2025
@bors
Copy link
Collaborator

bors commented Oct 26, 2025

⌛ Testing commit cdacfb8 with merge 58b4453...

@bors
Copy link
Collaborator

bors commented Oct 26, 2025

☀️ Test successful - checks-actions
Approved by: Zalathar
Pushing 58b4453 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 26, 2025
@bors bors merged commit 58b4453 into rust-lang:master Oct 26, 2025
12 checks passed
@rustbot rustbot added this to the 1.93.0 milestone Oct 26, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#148118 Improve the ICE message for invalid nullary intrinsic calls 2fa0112b74e850171ebbd269133a7ede049fe819 (link)
#148134 Add myself as a windows-msvc maintainer 7395dbb87ce7b33debbc7a8b2c548d3a1ebfcb25 (link)

previous master: a8664a1534

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

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 a8664a1 (parent) -> 58b4453 (this PR)

Test differences

Show 11 test diffs

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

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 58b4453fbd6f3e88046c3420b18b93c1f093bd12 --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. dist-powerpc64le-linux-musl: 5634.8s -> 4959.2s (-12.0%)
  2. tidy: 171.6s -> 189.8s (10.6%)
  3. aarch64-msvc-2: 5177.0s -> 4663.1s (-9.9%)
  4. dist-various-1: 4224.0s -> 3809.5s (-9.8%)
  5. dist-apple-various: 3341.6s -> 3026.7s (-9.4%)
  6. x86_64-msvc-1: 9038.6s -> 8235.7s (-8.9%)
  7. dist-ohos-armv7: 4198.4s -> 3836.6s (-8.6%)
  8. x86_64-msvc-2: 7055.2s -> 6472.4s (-8.3%)
  9. dist-x86_64-windows-gnullvm: 5151.0s -> 4730.3s (-8.2%)
  10. dist-aarch64-msvc: 5516.8s -> 5925.4s (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

Finished benchmarking commit (58b4453): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

Max RSS (memory usage)

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

Cycles

Results (primary -0.6%)

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

mean range count
Regressions ❌
(primary)		 1.2% [1.2%, 1.2%] 1
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -2.3% [-2.3%, -2.3%] 1
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -0.6% [-2.3%, 1.2%] 2

Binary size

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

Bootstrap: 474.827s -> 475.903s (0.23%)
Artifact size: 390.49 MiB -> 390.47 MiB (-0.01%)

@Zalathar Zalathar deleted the rollup-73hkwv8 branch October 26, 2025 22:14
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. T-libs Relevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.93.0

Development

Successfully merging this pull request may close these issues.

6 participants

@Zalathar @bors @rust-timer @rustbot @saethlin @Fulgen301