Skip to content

Clarified doc comments + added tests confirming current behavior for intersperse/intersperse_with#153265

Merged
rust-bors[bot] merged 1 commit intorust-lang:mainfrom
asder8215:intersperse_changes
Mar 3, 2026
Merged

Clarified doc comments + added tests confirming current behavior for intersperse/intersperse_with#153265
rust-bors[bot] merged 1 commit intorust-lang:mainfrom
asder8215:intersperse_changes

Conversation

@asder8215
Copy link
Contributor

@asder8215 asder8215 commented Mar 2, 2026

This PR builds on top of #152855. I just added clarifying comments to intersperse/intersperse_with about its guarantees for fused iterators (and how behavior for non-fused iterators are subject to change). I also added in tests for non-fused iterators demonstrating its current behavior; fused iterators are already tested for in existing tests for intersperse/intersperse_with.

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Mar 2, 2026
@rustbot
Copy link
Collaborator

rustbot commented Mar 2, 2026

r? @jhpratt

rustbot has assigned @jhpratt.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

Why was this reviewer chosen?

The reviewer was selected based on:

  • Owners of files modified in this PR: @scottmcm, libs
  • @scottmcm, libs expanded to 8 candidates
  • Random selection from Mark-Simulacrum, jhpratt, joboet, scottmcm

@asder8215 asder8215 force-pushed the intersperse_changes branch from 3652817 to 5d65c39 Compare March 2, 2026 02:13
Copy link
Member

@jhpratt jhpratt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In my opinion, this should be an extra commit on #152855 given that it is where discussion has taken place and it hasn't been merged yet.

View changes since this review

@asder8215
Copy link
Contributor Author

In my opinion, this should be an extra commit on #152855 given that it is where discussion has taken place and it hasn't been merged yet.

I could also make this a standalone PR without Zakarumych's commit since his change doesn't actually affect the logical behavior of intersperse currently (since interspersetransforms the iter into a fused iterator); what it does do is prevent us from entering the self.started branch if we see a None element as the first one in the iterator (maybe saving instructions for further .next() call after the first time seeing None? I don't know why one would do that, but it's possible).

I'll try making a PR to Zakarumych's branch later today though! I'll keep this PR open however if it takes a while to push it into Zakarumych's branch.

@asder8215 asder8215 force-pushed the intersperse_changes branch 2 times, most recently from a4fed7f to 612930d Compare March 2, 2026 23:54
…tersperse_with regarding fused/non-fused iterators
@asder8215 asder8215 force-pushed the intersperse_changes branch from 612930d to c8d343e Compare March 3, 2026 00:45
@asder8215
Copy link
Contributor Author

I decided to just remove Zakarumych's commit from this PR since I didn't see a way for me to add an extra commit to Zakarumych's PR; however, I've never done something like this and my assumption was that I could set the destination when creating another PR from this branch to Zakarumych's Rust fork defused-intersperse branch. I don't know if the suggestion feature allows you to suggest changes on a whole separate file (and create new file) that the PR doesn't pertain to.

If you know how I could add an extra commit to Zakarumych's PR, then I'll gladly try for that. Otherwise, I'm not certain about going down that route.

This PR should still pass the tests as per the previous comment.

@asder8215 asder8215 requested a review from jhpratt March 3, 2026 00:54
@jhpratt
Copy link
Member

jhpratt commented Mar 3, 2026

My bad! I assumed without checking that the author of both PRs was the same. Thank you for the clarification 🙂

@bors r+

@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 3, 2026

📌 Commit c8d343e has been approved by jhpratt

It is now in the queue for this repository.

@rust-bors rust-bors bot 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 Mar 3, 2026
@asder8215
Copy link
Contributor Author

It's all good, mistakes happen 👍

JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Mar 3, 2026
…hpratt

Clarified doc comments + added tests confirming current behavior for intersperse/intersperse_with

This PR builds on top of rust-lang#152855. I just added clarifying comments to `intersperse`/`intersperse_with` about its guarantees for fused iterators (and how behavior for non-fused iterators are subject to change). I also added in tests for non-fused iterators demonstrating its current behavior; fused iterators are already tested for in existing tests for `intersperse`/`intersperse_with`.
rust-bors bot pushed a commit that referenced this pull request Mar 3, 2026
…uwer

Rollup of 12 pull requests

Successful merges:

 - #152941 (prefer actual ABI-controling fields over target.abi when making ABI decisions)
 - #153227 (Don’t report missing fields in struct exprs with syntax errors.)
 - #153265 (Clarified doc comments + added tests confirming current behavior for intersperse/intersperse_with)
 - #152966 (Migrate 11 tests from tests/ui/issues to specific directories)
 - #153003 (rustdoc: make `--emit` and `--out-dir` mimic rustc)
 - #153034 (Remove unhelpful hint from trivial bound errors)
 - #153152 (Migration of LintDiagnostic - part 5)
 - #153177 (disable the ptr_fragment_in_final test on s390x)
 - #153221 (Add release notes for 1.94.0)
 - #153279 (feat: Provide an '.item_kind()' method on ItemEnum)
 - #153297 (Update the name of the Hermit operating system)
 - #153309 (Cleanup of c-variadic link test)
@rust-bors rust-bors bot merged commit c438462 into rust-lang:main Mar 3, 2026
11 checks passed
@rustbot rustbot added this to the 1.96.0 milestone Mar 3, 2026
rust-timer added a commit that referenced this pull request Mar 3, 2026
Rollup merge of #153265 - asder8215:intersperse_changes, r=jhpratt

Clarified doc comments + added tests confirming current behavior for intersperse/intersperse_with

This PR builds on top of #152855. I just added clarifying comments to `intersperse`/`intersperse_with` about its guarantees for fused iterators (and how behavior for non-fused iterators are subject to change). I also added in tests for non-fused iterators demonstrating its current behavior; fused iterators are already tested for in existing tests for `intersperse`/`intersperse_with`.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants