Add Iterator::intersperse_with #80567

lukaslueg · 2020-12-31T21:24:55Z

This is a follow-up to #79479, tracking in #79524, as discussed #79479 (comment).

Note that I had to manually implement Clone and Debug because derive insists on placing a Clone-bound on the struct-definition, which is too narrow. There is a long-standing issue # for this somewhere around here :-)

Also, note that I refactored the guts of Intersperse into private functions and re-used them in IntersperseWith, so I also went light on duplicating all the tests.

If this is suitable to be merged, the tracking issue should be updated, since it only mentions intersperse.

Happy New Year!

r? @m-ou-se

rust-log-analyzer · 2020-12-31T21:49:39Z

The job x86_64-gnu-llvm-9 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

.................................................................................................... 9000/11231
.................................................................................................... 9100/11231
.................................................................................................... 9200/11231
..................i......i.......................................................................... 9300/11231
.........................................................iiiiii..iiiiii.i........................... 9400/11231
.................................................................................................... 9600/11231
.................................................................................................... 9700/11231
.................................................................................................... 9800/11231
.................................................................................................... 9900/11231
---
Suite("src/test/assembly") not skipped for "bootstrap::test::Assembly" -- not in ["src/tools/tidy"]
Check compiletest suite=assembly mode=assembly (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)

running 27 tests
iiiiiiiiiiiiiiiiiiiiiiiiiii

 finished in 0.096 seconds
Suite("src/test/incremental") not skipped for "bootstrap::test::Incremental" -- not in ["src/tools/tidy"]
Check compiletest suite=incremental mode=incremental (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
---
Suite("src/test/debuginfo") not skipped for "bootstrap::test::Debuginfo" -- not in ["src/tools/tidy"]
Check compiletest suite=debuginfo mode=debuginfo (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)

running 116 tests
iiiiiiiiii.i.i..i..i..ii.....ii....ii..........iiii.........i.....i....i......ii.i.ii.....iiii.....i 100/116
test result: ok. 78 passed; 0 failed; 38 ignored; 0 measured; 0 filtered out; finished in 2.51s

 finished in 2.601 seconds
Suite("src/test/ui-fulldeps") not skipped for "bootstrap::test::UiFullDeps" -- not in ["src/tools/tidy"]
---
     |
3605 |     };
     |      ^ help: remove this semicolon
     |
     = note: `-D redundant-semicolons` implied by `-D warnings`
error: aborting due to previous error

error: could not compile `core`


To learn more, run the command again with --verbose.
warning: build failed, waiting for other jobs to finish...
error: build failed


command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "--target" "x86_64-unknown-linux-gnu" "-Zbinary-dep-depinfo" "-j" "16" "--release" "--locked" "--color" "always" "--features" "panic-unwind backtrace compiler-builtins-c" "--manifest-path" "/checkout/library/test/Cargo.toml" "-p" "core" "--" "--quiet"


failed to run: /checkout/obj/build/bootstrap/debug/bootstrap --stage 2 test --exclude src/tools/tidy
Build completed unsuccessfully in 0:21:48

lukaslueg · 2021-01-06T23:46:51Z

Removes the FIXME-notes due to this advisory.

lukaslueg · 2021-01-08T21:22:31Z

@m-ou-se poke :-)

m-ou-se

This looks great!

I have a small nit and a question:

library/core/src/iter/adapters/intersperse.rs

library/core/src/iter/traits/iterator.rs

lukaslueg · 2021-01-13T18:51:31Z

All addressed

m-ou-se

Thanks! This is ready to merge then, with two typos fixed:

library/core/src/iter/adapters/intersperse.rs

library/core/src/iter/traits/iterator.rs

library/core/src/iter/adapters/intersperse.rs

lukaslueg · 2021-01-14T08:46:44Z

All fixed, addressed the example a bit. gtg imo

m-ou-se · 2021-01-14T12:40:34Z

Thanks for working on this!

@bors r+

bors · 2021-01-14T12:40:36Z

📌 Commit 9b2f085 has been approved by m-ou-se

lukaslueg · 2021-01-14T13:17:37Z

Thanks for working on this!

@m-ou-se Thanks for your review!

Add Iterator::intersperse_with This is a follow-up to rust-lang#79479, tracking in rust-lang#79524, as discussed rust-lang#79479 (comment). ~~Note that I had to manually implement `Clone` and `Debug` because `derive` insists on placing a `Clone`-bound on the struct-definition, which is too narrow. There is a long-standing issue # for this somewhere around here :-)~~ Also, note that I refactored the guts of `Intersperse` into private functions and re-used them in `IntersperseWith`, so I also went light on duplicating all the tests. If this is suitable to be merged, the tracking issue should be updated, since it only mentions `intersperse`. Happy New Year! r? `@m-ou-se`

Rollup of 17 pull requests Successful merges: - rust-lang#79982 (Add missing methods to unix ExitStatusExt) - rust-lang#80017 (Suggest `_` and `..` if a pattern has too few fields) - rust-lang#80169 (Recommend panic::resume_unwind instead of panicking.) - rust-lang#80217 (Add a `std::io::read_to_string` function) - rust-lang#80444 (Add as_ref and as_mut methods for Bound) - rust-lang#80567 (Add Iterator::intersperse_with) - rust-lang#80829 (Get rid of `DepConstructor`) - rust-lang#80895 (Fix handling of malicious Readers in read_to_end) - rust-lang#80966 (Deprecate atomic::spin_loop_hint in favour of hint::spin_loop) - rust-lang#80969 (Use better ICE message when no MIR is available) - rust-lang#80972 (Remove unstable deprecated Vec::remove_item) - rust-lang#80973 (Update books) - rust-lang#80980 (Fixed incorrect doc comment) - rust-lang#80981 (Fix -Cpasses=list and llvm version print with -vV) - rust-lang#80985 (Fix stabilisation version of slice_strip) - rust-lang#80990 (llvm: Remove the unused context from CreateDebugLocation) - rust-lang#80991 (Fix formatting specifiers doc links) Failed merges: - rust-lang#80944 (Use Option::map_or instead of `.map(..).unwrap_or(..)`) r? `@ghost` `@rustbot` modify labels: rollup

rust-highfive assigned m-ou-se Dec 31, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 31, 2020

Add Iterator::intersperse_with

7ed824e

lukaslueg force-pushed the intersperse_with branch from 0fd4758 to 7ed824e Compare December 31, 2020 22:09

lukaslueg mentioned this pull request Jan 2, 2021

#[derive] sometimes uses incorrect bounds #26925

Open

Remove FIXME-notes

7a0ada0

m-ou-se reviewed Jan 13, 2021

View reviewed changes

library/core/src/iter/adapters/intersperse.rs Outdated Show resolved Hide resolved

library/core/src/iter/adapters/intersperse.rs Show resolved Hide resolved

library/core/src/iter/traits/iterator.rs Outdated Show resolved Hide resolved

m-ou-se mentioned this pull request Jan 13, 2021

Tracking Issue for Iterator::intersperse #79524

Open

6 tasks

m-ou-se added A-iterators Area: Iterators T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. labels Jan 13, 2021

Add doc intralinks

9528988

m-ou-se reviewed Jan 13, 2021

View reviewed changes

Improve Iterator::intersperse_ docs

9b2f085

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 Jan 14, 2021

This was referenced Jan 14, 2021

Rollup of 19 pull requests #81013

Closed

Rollup of 17 pull requests #81018

Merged

bors merged commit 446ed77 into rust-lang:master Jan 14, 2021

rustbot added this to the 1.51.0 milestone Jan 14, 2021

lukaslueg deleted the intersperse_with branch January 15, 2021 08:46

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Iterator::intersperse_with #80567

Add Iterator::intersperse_with #80567

lukaslueg commented Dec 31, 2020 •

edited

Loading

rust-log-analyzer commented Dec 31, 2020

lukaslueg commented Jan 6, 2021

lukaslueg commented Jan 8, 2021

m-ou-se left a comment

lukaslueg commented Jan 13, 2021 •

edited

Loading

m-ou-se left a comment

lukaslueg commented Jan 14, 2021

m-ou-se commented Jan 14, 2021

bors commented Jan 14, 2021

lukaslueg commented Jan 14, 2021

Add Iterator::intersperse_with #80567

Add Iterator::intersperse_with #80567

Conversation

lukaslueg commented Dec 31, 2020 • edited Loading

rust-log-analyzer commented Dec 31, 2020

lukaslueg commented Jan 6, 2021

lukaslueg commented Jan 8, 2021

m-ou-se left a comment

Choose a reason for hiding this comment

lukaslueg commented Jan 13, 2021 • edited Loading

m-ou-se left a comment

Choose a reason for hiding this comment

lukaslueg commented Jan 14, 2021

m-ou-se commented Jan 14, 2021

bors commented Jan 14, 2021

lukaslueg commented Jan 14, 2021

lukaslueg commented Dec 31, 2020 •

edited

Loading

lukaslueg commented Jan 13, 2021 •

edited

Loading