Skip to content

Rollup of 3 pull requests #133251

New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom
Merged
merged 6 commits into from
Nov 20, 2024
Merged

Rollup of 3 pull requests #133251

merged 6 commits into from
Nov 20, 2024

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

kleisauke and others added 6 commits November 20, 2024 10:47
@kleisauke
Fix LLVM target triple for x86_64-win7-windows-msvc
57ed8e8 
The vendor field needs to be `pc` rather than `win7`.
@RalfJung
interpret: make typing_env field private
d04088f
@GKFX @tgross35
Stabilize const_pin_2
5777c73
@matthiaskrgr
Rollup merge of rust-lang#131904 - GKFX:stabilize-const-pin-2, r=tgro…
2595118 
…ss35

Stabilize const_pin_2

Tracking issue rust-lang#76654; review before FCP in progress.
@matthiaskrgr
Rollup merge of rust-lang#133239 - kleisauke:fix-llvm-triple-x86_64-w…
d332656 
…in7-windows-msvc, r=ChrisDenton

Fix LLVM target triple for `x86_64-win7-windows-msvc`

The vendor field needs to be `pc` rather than `win7`.
@matthiaskrgr
Rollup merge of rust-lang#133241 - RalfJung:typing-env, r=lcnr
b1413e0 
interpret: make typing_env field private

This was made public in rust-lang#133212 but IMO it should remain private. (Specifically, this prevents it from being mutated.)

r? `@lcnr`
@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 Nov 20, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=3

@bors
Copy link
Collaborator

bors commented Nov 20, 2024

📌 Commit b1413e0 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 Nov 20, 2024
@bors
Copy link
Collaborator

bors commented Nov 20, 2024

⌛ Testing commit b1413e0 with merge a1f2999...

@bors
Copy link
Collaborator

bors commented Nov 20, 2024

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 20, 2024
@bors bors merged commit a1f2999 into rust-lang:master Nov 20, 2024
7 checks passed
@rustbot rustbot added this to the 1.84.0 milestone Nov 20, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#131904 Stabilize const_pin_2 d982e048794f5728a23271800ddc97379a4ec508 (link)
#133239 Fix LLVM target triple for x86_64-win7-windows-msvc 3761805b6e5c9e491300cfe42a338cd1d9d379be (link)
#133241 interpret: make typing_env field private 42d10d8df8a22200a8c78f073775616cf8943117 (link)

previous master: bfe809d93c

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 (a1f2999): 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)		 -1.1% [-1.1%, -1.1%] 1
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (secondary 3.0%)

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.0% [3.0%, 3.0%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
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: 793.512s -> 794.285s (0.10%)
Artifact size: 335.99 MiB -> 336.01 MiB (0.01%)

@matthiaskrgr matthiaskrgr deleted the rollup-gjeis3q branch January 25, 2025 09:13
# for free to join this conversation on GitHub. Already have an account? # 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.84.0
Development

Successfully merging this pull request may close these issues.
7 participants
@matthiaskrgr @bors @rust-timer @rustbot @kleisauke @RalfJung @GKFX