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

Rename Iterator::get_unchecked #77201

Merged
merged 2 commits into from
Sep 25, 2020

Conversation

matthewjasper
Copy link
Contributor

Closes #76479

r? @pnkfelix

It's possible for method resolution to pick this method over a lower
priority stable method,  causing compilation errors. Since this method
is permanently unstable, give it a name that is very unlikely to be used
in user code.
@matthewjasper matthewjasper added beta-nominated Nominated for backporting to the compiler in the beta channel. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Sep 25, 2020
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 25, 2020
@spastorino
Copy link
Member

@bors p=1
as it fixes a P-critical issue.

Waiting for CI to r+

@spastorino
Copy link
Member

spastorino commented Sep 25, 2020

@bors r+ rollup=always
In general I wouldn't rollup PRs for P-critical issues but given that this is a method renaming seems unrisky.

@bors
Copy link
Contributor

bors commented Sep 25, 2020

📌 Commit 04a0b1d has been approved by spastorino

@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 Sep 25, 2020
@bors
Copy link
Contributor

bors commented Sep 25, 2020

💡 This pull request was already approved, no need to approve it again.

@bors
Copy link
Contributor

bors commented Sep 25, 2020

📌 Commit 04a0b1d has been approved by spastorino

@bors
Copy link
Contributor

bors commented Sep 25, 2020

⌛ Testing commit 04a0b1d with merge 043f6d7...

@bors
Copy link
Contributor

bors commented Sep 25, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: spastorino
Pushing 043f6d7 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 25, 2020
@bors bors merged commit 043f6d7 into rust-lang:master Sep 25, 2020
@rustbot rustbot added this to the 1.48.0 milestone Sep 25, 2020
@matthewjasper matthewjasper deleted the rename-get-unchecked branch September 26, 2020 09:40
@Mark-Simulacrum Mark-Simulacrum modified the milestones: 1.48.0, 1.47.0 Sep 28, 2020
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Sep 28, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 29, 2020
…ulacrum

[beta] backports

This backports the following:
 *  revert const_type_id stabilization rust-lang#77083
 * [mir-opt] Disable the `ConsideredEqual` logic in SimplifyBranchSame opt rust-lang#76837
 * Rename Iterator::get_unchecked rust-lang#77201 (manually, because of file renaming and other issues on master causing literal cherry-pick to fail)
 *  Rebase LLVM onto 11.0.0-rc3 rust-lang#77063 (bumping direct to master, see rust-lang#77063 (comment)).

The last two have not yet been approved by compiler team, but I'm posting this now and going to go ahead and approve as I expect both to get approved and we want testing as much as possible before release in ~2 weeks.

r? `@ghost`
@spastorino
Copy link
Member

discussed in T-compiler meeting.

@rustbot modify labels: beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Oct 1, 2020
@matthewjasper matthewjasper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 1, 2020
@matthewjasper
Copy link
Contributor Author

#77308 backported this

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. merged-by-bors This PR was explicitly merged by bors. 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
Development

Successfully merging this pull request may close these issues.

regression: get_unchecked resolves to unstable feature use
7 participants