diff options
| author | Mara Bos <m-ou.se@m-ou.se> | 2020-11-22 23:00:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-22 23:00:55 +0100 |
| commit | 4407049fcbdc8fce56573a4271b90384a269abbc (patch) | |
| tree | aed62afbeeaef07f6bf1cc9657e7238441397c80 /src/test | |
| parent | 9b98f1d226305913c7c205bd98b6ea6b9fe3b8ce (diff) | |
| parent | 461265825bf8bf4382a428629a9bff9b6b1665e0 (diff) | |
| download | rust-4407049fcbdc8fce56573a4271b90384a269abbc.tar.gz rust-4407049fcbdc8fce56573a4271b90384a269abbc.zip | |
Rollup merge of #77697 - WaffleLapkin:iter_split_adaptors, r=m-ou-se
Split each iterator adapter and source into individual modules This PR creates individual modules for each iterator adapter and iterator source. This is done to enhance the readability of corresponding modules (`adapters/mod.rs` and `sources.rs`) which were hard to navigate and read because of lots of repeated lines (e.g.: `adapters/mod.rs` was 3k lines long). This is also in line with some adapters which already had their own modules (`Flatten`, `FlatMap`, `Chain`, `Zip`, `Fuse`). This PR also makes `Take`s adapter fields private (I have no idea why they were `pub(super)` before). r? ``@LukasKalbertodt``
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/ui/issues/issue-31173.stderr | 6 | ||||
| -rw-r--r-- | src/test/ui/mismatched_types/issue-36053-2.stderr | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/test/ui/issues/issue-31173.stderr b/src/test/ui/issues/issue-31173.stderr index 818e004ffc8..d371703e295 100644 --- a/src/test/ui/issues/issue-31173.stderr +++ b/src/test/ui/issues/issue-31173.stderr @@ -13,11 +13,13 @@ error[E0599]: no method named `collect` found for struct `Cloned<TakeWhile<&mut LL | .collect(); | ^^^^^^^ method not found in `Cloned<TakeWhile<&mut std::vec::IntoIter<u8>, [closure@$DIR/issue-31173.rs:6:39: 9:6]>>` | - ::: $SRC_DIR/core/src/iter/adapters/mod.rs:LL:COL + ::: $SRC_DIR/core/src/iter/adapters/cloned.rs:LL:COL | LL | pub struct Cloned<I> { | -------------------- doesn't satisfy `_: Iterator` -... + | + ::: $SRC_DIR/core/src/iter/adapters/take_while.rs:LL:COL + | LL | pub struct TakeWhile<I, P> { | -------------------------- doesn't satisfy `<_ as Iterator>::Item = &_` | diff --git a/src/test/ui/mismatched_types/issue-36053-2.stderr b/src/test/ui/mismatched_types/issue-36053-2.stderr index 0b1fcf58e2e..2efd37b4738 100644 --- a/src/test/ui/mismatched_types/issue-36053-2.stderr +++ b/src/test/ui/mismatched_types/issue-36053-2.stderr @@ -15,7 +15,7 @@ LL | once::<&str>("str").fuse().filter(|a: &str| true).count(); | doesn't satisfy `<_ as FnOnce<(&&str,)>>::Output = bool` | doesn't satisfy `_: FnMut<(&&str,)>` | - ::: $SRC_DIR/core/src/iter/adapters/mod.rs:LL:COL + ::: $SRC_DIR/core/src/iter/adapters/filter.rs:LL:COL | LL | pub struct Filter<I, P> { | ----------------------- doesn't satisfy `_: Iterator` |