Skip to content
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.

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

Rollup of 3 pull requests #135286

Merged
merged 17 commits into from
Jan 9, 2025
Merged

Rollup of 3 pull requests #135286

merged 17 commits into from
Jan 9, 2025

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Kobzol and others added 17 commits January 7, 2025 18:15
The `image` part didn't really make sense, especially since we started splitting CI jobs.
Make it easier to run CI jobs locally

This PR extends the Python CI script to perform a poor man's CI-like execution of a given CI job locally. It's not perfect, but it's better than nothing.

r? `@jieyouxu`
Make `lit_to_mir_constant` and `lit_to_const` infallible

My motivation for this change is just that it's annoying to check everywhere, especially since all but one call site was just ICEing on errors anyway right there.

They can still fail, but now just return an error constant instead of having the caller handle the error.

fixes rust-lang#114317
fixes rust-lang#126182
…ity-substs, r=oli-obk

Account for identity substituted items in symbol mangling

See the inline comment.

r? oli-obk

Fixes rust-lang#135235
@rustbot rustbot added A-rustc-dev-guide Area: rustc-dev-guide A-testsuite Area: The testsuite used to check the correctness of rustc 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-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Jan 9, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=3

@bors
Copy link
Contributor

bors commented Jan 9, 2025

📌 Commit 41c7d5a 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 Jan 9, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 9, 2025
…iaskrgr

Rollup of 3 pull requests

Successful merges:

 - rust-lang#134898 (Make it easier to run CI jobs locally)
 - rust-lang#135195 (Make `lit_to_mir_constant` and `lit_to_const` infallible)
 - rust-lang#135261 (Account for identity substituted items in symbol mangling)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Contributor

bors commented Jan 9, 2025

⌛ Testing commit 41c7d5a with merge 8247594...

@bors
Copy link
Contributor

bors commented Jan 9, 2025

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 9, 2025
@bors bors merged commit 8247594 into rust-lang:master Jan 9, 2025
7 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Jan 9, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#134898 Make it easier to run CI jobs locally 3f78ce9c749c3e141d8d77c2bae2a758bd98fa78 (link)
#135195 Make lit_to_mir_constant and lit_to_const infallible 49017c71aedc52dee42c414af58e4b851449919d (link)
#135261 Account for identity substituted items in symbol mangling ed049f53b718de74ed16e57ad4d3fd1a81850df8 (link)

previous master: 251206c27b

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

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (8247594): comparison URL.

Overall result: ✅ improvements - 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
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.2% [-0.2%, -0.2%] 1
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (secondary -3.1%)

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)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-3.1% [-3.1%, -3.1%] 1
All ❌✅ (primary) - - 0

Cycles

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

Binary size

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

Bootstrap: 763.48s -> 763.498s (0.00%)
Artifact size: 325.77 MiB -> 325.70 MiB (-0.02%)

@matthiaskrgr matthiaskrgr deleted the rollup-sxuq1nh branch January 25, 2025 09:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-rustc-dev-guide Area: rustc-dev-guide A-testsuite Area: The testsuite used to check the correctness of rustc 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-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants