Skip to content

Stabilize const_pin_2 #131904

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 1 commit into from
Nov 20, 2024
Merged

Stabilize const_pin_2 #131904

merged 1 commit into from
Nov 20, 2024

Conversation

GKFX
Copy link
Contributor

@GKFX GKFX commented Oct 18, 2024 •
edited
Loading

Tracking issue #76654; review before FCP in progress.

@rustbot
Copy link
Collaborator

rustbot commented Oct 18, 2024

r? @joboet

rustbot has assigned @joboet.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Oct 18, 2024
@joboet joboet added S-waiting-on-fcp Status: PR is in FCP and is awaiting for FCP to complete. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 19, 2024
@bors
Copy link
Collaborator

bors commented Nov 4, 2024

☔ The latest upstream changes (presumably #132586) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Nov 4, 2024
@tgross35
Copy link
Contributor

FCP completed at #76654 (comment), this needs a rebase.

@tgross35 tgross35 mentioned this pull request Nov 17, 2024
Closed
@RalfJung RalfJung removed the S-waiting-on-fcp Status: PR is in FCP and is awaiting for FCP to complete. label Nov 17, 2024
@tgross35
Copy link
Contributor

@GKFX would you be able to rebase this soon-ish? The next beta branch is only two days away, it would be nice to have this in the same release as the rest of const_pin.

@RalfJung
Copy link
Member

@tgross35 I think you can just do the rebase and push to their branch.

@tgross35
Copy link
Contributor

It seems like that would let me create a merge commit but no rebase :( unless I am missing something (I think it's different if you have actual write permissions rather than maintain)

@RalfJung
Copy link
Member

RalfJung commented Nov 20, 2024 •
edited
Loading

You have to force-push after a rebase. It should work fine, I've done this for other PRs in the past.

@tgross35 tgross35 force-pushed the stabilize-const-pin-2 branch from 32b3c1e to 5777c73 Compare November 20, 2024 13:15
@tgross35
Copy link
Contributor

That's interesting; I guess --force-with-lease that I use for everything doesn't work here but --force does. Thanks for the hint.

@tgross35
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Nov 20, 2024

📌 Commit 5777c73 has been approved by tgross35

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 20, 2024
@matthiaskrgr matthiaskrgr mentioned this pull request Nov 20, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 20, 2024
@bors
Auto merge of rust-lang#133251 - matthiaskrgr:rollup-gjeis3q, r=matth…
a1f2999 
…iaskrgr

Rollup of 3 pull requests

Successful merges:

 - rust-lang#131904 (Stabilize const_pin_2)
 - rust-lang#133239 (Fix LLVM target triple for `x86_64-win7-windows-msvc`)
 - rust-lang#133241 (interpret: make typing_env field private)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 2595118 into rust-lang:master Nov 20, 2024
6 checks passed
@rustbot rustbot added this to the 1.84.0 milestone Nov 20, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Nov 20, 2024
@rust-timer
Unrolled build for rust-lang#131904
d982e04 
Rollup merge of rust-lang#131904 - GKFX:stabilize-const-pin-2, r=tgross35

Stabilize const_pin_2

Tracking issue rust-lang#76654; review before FCP in progress.
@GKFX GKFX deleted the stabilize-const-pin-2 branch December 1, 2024 09:32
@RalfJung RalfJung mentioned this pull request Dec 26, 2024
Closed
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@joboet joboet

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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.
6 participants
@GKFX @rustbot @bors @tgross35 @RalfJung @joboet