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

Revert "Stabilize Iterator::intersperse()" #89638

Merged
merged 1 commit into from
Oct 8, 2021
Merged

Conversation

yaahc
Copy link
Member

@yaahc yaahc commented Oct 7, 2021

Reverts #88548

First step in resolving #88967

@rust-highfive
Copy link
Collaborator

r? @joshtriplett

(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 Oct 7, 2021
@yaahc
Copy link
Member Author

yaahc commented Oct 7, 2021

cc @Mark-Simulacrum

@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 Oct 7, 2021
@Mark-Simulacrum
Copy link
Member

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Oct 7, 2021

📌 Commit 8965b58 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 Oct 7, 2021
@camelid
Copy link
Member

camelid commented Oct 7, 2021

I think intersperse() needs to be removed from the release notes as well.

@Mark-Simulacrum
Copy link
Member

Yeah. @yaahc if you get to updating this pr in time, feel free to just drop it from there, otherwise can do in a future edit -- no worries either way.

@bors
Copy link
Contributor

bors commented Oct 7, 2021

⌛ Testing commit 8965b58 with merge 2ee06e7...

@bors
Copy link
Contributor

bors commented Oct 8, 2021

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 8, 2021
@bors bors merged commit 2ee06e7 into master Oct 8, 2021
@bors bors deleted the revert-88548-intersperse branch October 8, 2021 02:46
@rustbot rustbot added this to the 1.57.0 milestone Oct 8, 2021
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (2ee06e7): comparison url.

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

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

@rustbot label: -perf-regression

@cuviper cuviper mentioned this pull request Oct 13, 2021
@cuviper cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 13, 2021
@cuviper cuviper modified the milestones: 1.57.0, 1.56.0 Oct 13, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 14, 2021
[beta] backports

- 2229: Consume IfLet expr rust-lang#89282
- Wrapper for -Z gcc-ld=lld to invoke rust-lld with the correct flavor rust-lang#89288
- Fix unsound optimization with explicit variant discriminants rust-lang#89489
- Fix stabilization version for bindings_after_at rust-lang#89605
- Turn vtable_allocation() into a query rust-lang#89619
- Revert "Stabilize Iterator::intersperse()" rust-lang#89638
- Ignore type of projections for upvar capturing rust-lang#89648
- ~~Add Poll::ready and~~ revert stabilization of task::ready! rust-lang#89651
- CI: Use mirror for libisl downloads for more docker dist builds rust-lang#89661
-  Use correct edition for panic in [debug_]assert!(). rust-lang#89622
-  Switch to our own mirror of libisl plus ct-ng oldconfig fixes rust-lang#89599
-  Emit item no type error even if type inference fails rust-lang#89585
-  Revert enum discriminants rust-lang#89884
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants