Skip to content

Destabilise entry_insert #94105

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

Merged
merged 1 commit into from
Feb 19, 2022
Merged

Conversation

5225225
Copy link
Contributor

@5225225 5225225 commented Feb 17, 2022

See: #90345

I didn't revert the rename that was done in that PR, I left it as entry_insert.

Additionally, before that PR, VacantEntry::insert_entry seemingly had no stability attribute on it? I kept the attribute, just made it an unstable one, same as the one on Entry.

There didn't seem to be any mention of this in the RELEASES.md, so I don't think there's anything for me to do other than this?

@rust-highfive
Copy link
Contributor

r? @m-ou-se

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 17, 2022
@Mark-Simulacrum Mark-Simulacrum added beta-accepted Accepted for backporting to the compiler in the beta channel. beta-nominated Nominated for backporting to the compiler in the beta channel. labels Feb 17, 2022
@Mark-Simulacrum
Copy link
Member

Dropped this from pending release notes (#93639).

@bors r+ rollup p=1

@bors
Copy link
Collaborator

bors commented Feb 17, 2022

📌 Commit 319dd15 has been approved by Mark-Simulacrum

@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 Feb 17, 2022
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 18, 2022
…=Mark-Simulacrum

Destabilise entry_insert

See: rust-lang#90345

I didn't revert the rename that was done in that PR, I left it as `entry_insert`.

Additionally, before that PR, `VacantEntry::insert_entry` seemingly had no stability attribute on it? I kept the attribute, just made it an unstable one, same as the one on `Entry`.

There didn't seem to be any mention of this in the RELEASES.md, so I don't think there's anything for me to do other than this?
@bors
Copy link
Collaborator

bors commented Feb 19, 2022

⌛ Testing commit 319dd15 with merge cb4ee81...

@bors
Copy link
Collaborator

bors commented Feb 19, 2022

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing cb4ee81 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 19, 2022
@bors bors merged commit cb4ee81 into rust-lang:master Feb 19, 2022
@rustbot rustbot added this to the 1.60.0 milestone Feb 19, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (cb4ee81): comparison url.

Summary: This benchmark run did not return any relevant results.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Feb 21, 2022
@Mark-Simulacrum Mark-Simulacrum modified the milestones: 1.60.0, 1.59.0 Feb 21, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 22, 2022
…imulacrum

[stable] 1.59.0 release

This adds in a few backports:

*  Destabilise entry_insert rust-lang#94105
*  Update compiler_builtins to fix duplicate symbols in armv7-linux-androideabi rlib rust-lang#93436

This also includes a fresh commit replicating the 1.52.1 patch soft-disabling incremental for 1.59, in light of discussion on rust-lang#94124. This hasn't yet been fully approved but I think is the likely way things will go, so preparing the first round of stable artifacts with that in mind.

r? `@Mark-Simulacrum`
@5225225 5225225 deleted the destabilise-entry-insert branch August 18, 2022 20:28
# for free to join this conversation on GitHub. Already have an account? # 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants