Skip to content

Rename Iterator::get_unchecked - #77201

Merged
bors merged 2 commits into
rust-lang:masterfrom
matthewjasper:rename-get-unchecked
Sep 25, 2020
Merged

Rename Iterator::get_unchecked#77201
bors merged 2 commits into
rust-lang:masterfrom
matthewjasper:rename-get-unchecked

Conversation

@matthewjasper

@matthewjaspermatthewjasper commented Sep 25, 2020

Copy link
Copy Markdown
Contributor

@matthewjasper
Improve <vec::IntoIter>::get_unchecked` safety comment
323a279
@matthewjasper
Rename Iterator::get_unchecked
04a0b1d
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.
@matthewjaspermatthewjasper 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-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 25, 2020
@spastorino

spastorino commented Sep 25, 2020

Copy link
Copy Markdown
Member

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

Waiting for CI to r+

@spastorino

spastorino commented Sep 25, 2020•
edited
Loading

Copy link
Copy Markdown
Member

@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

bors commented Sep 25, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 04a0b1d has been approved by spastorino

@borsbors 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

bors commented Sep 25, 2020

Copy link
Copy Markdown
Collaborator

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

@bors

bors commented Sep 25, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 04a0b1d has been approved by spastorino

@bors

bors commented Sep 25, 2020

Copy link
Copy Markdown
Collaborator

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

@bors

bors commented Sep 25, 2020

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Sep 25, 2020
@bors
bors merged commit 043f6d7 into rust-lang:masterSep 25, 2020
@rustbotrustbot added this to the 1.48.0 milestone Sep 25, 2020
@borsbors mentioned this pull request Sep 26, 2020
Merged
@matthewjasper
matthewjasper deleted the rename-get-unchecked branch September 26, 2020 09:40
@spastorinospastorino mentioned this pull request Sep 28, 2020
Closed
@Mark-SimulacrumMark-Simulacrum mentioned this pull request Sep 28, 2020
Merged
@Mark-SimulacrumMark-Simulacrum modified the milestones: 1.48.0, 1.47.0Sep 28, 2020
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Sep 28, 2020
@Mark-Simulacrum
Rename Iterator::get_unchecked -> Iterator::__iterator_get_unchecked
656fa79
Backport of rust-lang#77201, manually done because of file renaming.
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 29, 2020
@bors
Auto merge ofrust-lang#77308- Mark-Simulacrum:beta-next, r=Mark-Sim…
9f0e6fa
…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

spastorino commented Oct 1, 2020

Copy link
Copy Markdown
Member

discussed in T-compiler meeting.

@rustbot modify labels: beta-accepted

@rustbotrustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Oct 1, 2020
@matthewjaspermatthewjasper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 1, 2020
@matthewjasper

matthewjasper commented Oct 1, 2020

Copy link
Copy Markdown
ContributorAuthor

#77308 backported this

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@spastorinospastorinospastorino approved these changes

Assignees

@pnkfelixpnkfelix

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.47.0

Development

Successfully merging this pull request may close these issues.

regression: get_unchecked resolves to unstable feature use

7 participants

@matthewjasper@spastorino@bors@pnkfelix@Mark-Simulacrum@rust-highfive@rustbot