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.

Sign up for GitHub

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

Jump to bottom

Stabilize iter::zip #91881

Merged
merged 2 commits into from
Dec 15, 2021
Merged

Stabilize iter::zip #91881

merged 2 commits into from
Dec 15, 2021

Conversation

Patrick-Poitras
Copy link
Contributor

Hello all!

As the tracking issue (#83574) for iter::zip completed the final commenting period without any concerns being raised, I hereby submit this stabilization PR on the issue.

As the pull request that introduced the feature (#82917) states, the iter::zip function is a shorter way to zip two iterators. As it's generally a quality-of-life/ergonomic improvement, it has been integrated into the codebase without any trouble, and has been
used in many places across the rust compiler and standard library since March without any issues.

For more details, I would refer to @cuviper's original PR, or the function's documentation.

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Dec 13, 2021
@rust-highfive
Copy link
Collaborator

Changes rustc_apfloat. rustc_apfloat is currently in limbo and you almost certainly don't want to change it (see #55993).

cc @eddyb

Some changes occurred in src/tools/clippy.

cc @rust-lang/clippy

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @m-ou-se (or someone else) soon.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 13, 2021
@Mark-Simulacrum Mark-Simulacrum removed the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Dec 14, 2021
@jyn514 jyn514 added T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. needs-fcp This change is insta-stable, so needs a completed FCP to proceed. and removed needs-fcp This change is insta-stable, so needs a completed FCP to proceed. labels Dec 14, 2021
@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Dec 14, 2021
@Patrick-Poitras
Copy link
Contributor Author

@workingjubilee I have undid those changes and then redid them. I don't know if that helps you at all, please let me know if it doesn't.

@bors
Copy link
Contributor

bors commented Dec 14, 2021

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

@jyn514
Copy link
Member

jyn514 commented Dec 14, 2021

@Patrick-Poitras can you squash the first two commits together? That way the only commit modifying clippy is the last one.

https://rustc-dev-guide.rust-lang.org/git.html#advanced-rebasing

@camelid camelid removed the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Dec 14, 2021
@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Dec 14, 2021
@Patrick-Poitras
Copy link
Contributor Author

@jyn514 done!

Thanks to @cuviper and @wesleywiser on Zulip for helping me out when I messed up the merging!

@scottmcm scottmcm added the relnotes Marks issues that should be documented in the release notes of the next release. label Dec 14, 2021
@rustbot rustbot added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Dec 14, 2021
@Patrick-Poitras Patrick-Poitras force-pushed the stabilize-iter-zip branch 3 times, most recently from decef6d to 016ee5f Compare December 14, 2021 22:33
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@inquisitivecrystal inquisitivecrystal removed T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Dec 14, 2021
@scottmcm
Copy link
Member

Thanks for the PR, @Patrick-Poitras! Sorry it was so 😬

r? @scottmcm
@bors r+

@bors
Copy link
Contributor

bors commented Dec 14, 2021

📌 Commit 047adb5 has been approved by scottmcm

@rust-highfive rust-highfive assigned scottmcm and unassigned m-ou-se Dec 14, 2021
@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 Dec 14, 2021
@scottmcm scottmcm mentioned this pull request Dec 14, 2021
Closed
3 tasks
@scottmcm scottmcm linked an issue Dec 14, 2021 that may be closed by this pull request
Tracking Issue for core::iter::zip #83574
Closed
3 tasks
@matthiaskrgr matthiaskrgr mentioned this pull request Dec 15, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 15, 2021
@bors
Auto merge of rust-lang#91945 - matthiaskrgr:rollup-jszf9zp, r=matthi…
195e931 
…askrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#90939 (Tweak errors coming from `for`-loop, `?` and `.await` desugaring)
 - rust-lang#91859 (Iterator::cycle() — document empty iterator special case)
 - rust-lang#91868 (Use `OutputFilenames` to generate output file for `-Zllvm-time-trace`)
 - rust-lang#91870 (Revert setting a default for the MACOSX_DEPLOYMENT_TARGET env var for linking)
 - rust-lang#91881 (Stabilize `iter::zip`)
 - rust-lang#91882 (Remove `in_band_lifetimes` from `rustc_typeck`)
 - rust-lang#91940 (Update cargo)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 4e7497b into rust-lang:master Dec 15, 2021
@rustbot rustbot added this to the 1.59.0 milestone Dec 15, 2021
@scottmcm scottmcm mentioned this pull request Dec 15, 2021
Closed
flip1995 pushed a commit to flip1995/rust that referenced this pull request Dec 17, 2021
@matthiaskrgr
Rollup merge of rust-lang#91881 - Patrick-Poitras:stabilize-iter-zip,…
55df990 
… r=scottmcm

Stabilize `iter::zip`

Hello all!

As the tracking issue (rust-lang#83574) for `iter::zip` completed the final commenting period without any concerns being raised, I hereby submit this stabilization PR on the issue.

As the pull request that introduced the feature (rust-lang#82917) states, the `iter::zip` function is a shorter way to zip two iterators. As it's generally a quality-of-life/ergonomic improvement, it has been integrated into the codebase without any trouble, and has been
used in many places across the rust compiler and standard library since March without any issues.

For more details, I would refer to `@cuviper's` original PR, or the [function's documentation](https://doc.rust-lang.org/std/iter/fn.zip.html).
@Patrick-Poitras Patrick-Poitras deleted the stabilize-iter-zip branch December 23, 2021 03:26
@dtolnay dtolnay mentioned this pull request Dec 23, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@scottmcm scottmcm scottmcm left review comments

@workingjubilee workingjubilee workingjubilee left review comments

@jyn514 jyn514 jyn514 approved these changes

Assignees

@scottmcm scottmcm

Labels
relnotes Marks issues that should be documented in the release notes of the next release. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs-api Relevant to the library API team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.59.0
Development

Successfully merging this pull request may close these issues.

Tracking Issue for core::iter::zip