Skip to content

Commit 0ed0d63

Browse files
k-nasaStjepan Glavina
authored and
Stjepan Glavina
committed
Remove unnecessary trait bound on FlatMap (#651)
* Remove unnecessary trait bound on FlatMap * test: upgrade test code
1 parent 98d45f4 commit 0ed0d63

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

Diff for: src/stream/stream/flat_map.rs

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ where
4141
impl<S, U, F> Stream for FlatMap<S, U, F>
4242
where
4343
S: Stream,
44-
S::Item: IntoStream<IntoStream = U, Item = U::Item>,
4544
U: Stream,
4645
F: FnMut(S::Item) -> U,
4746
{

Diff for: src/stream/stream/mod.rs

+11-7
Original file line numberDiff line numberDiff line change
@@ -791,18 +791,22 @@ extension_trait! {
791791
# async_std::task::block_on(async {
792792
793793
use async_std::prelude::*;
794-
use async_std::stream::IntoStream;
795794
use async_std::stream;
796795
797-
let inner1 = stream::from_iter(vec![1,2,3]);
798-
let inner2 = stream::from_iter(vec![4,5,6]);
796+
let words = stream::from_iter(&["alpha", "beta", "gamma"]);
799797
800-
let s = stream::from_iter(vec![inner1, inner2]);
798+
let merged: String = words
799+
.flat_map(|s| stream::from_iter(s.chars()))
800+
.collect().await;
801+
assert_eq!(merged, "alphabetagamma");
801802
802-
let v :Vec<_> = s.flat_map(|s| s.into_stream()).collect().await;
803-
804-
assert_eq!(v, vec![1,2,3,4,5,6]);
803+
let d3 = stream::from_iter(&[[[1, 2], [3, 4]], [[5, 6], [7, 8]]]);
804+
let d1: Vec<_> = d3
805+
.flat_map(|item| stream::from_iter(item))
806+
.flat_map(|item| stream::from_iter(item))
807+
.collect().await;
805808
809+
assert_eq!(d1, [&1, &2, &3, &4, &5, &6, &7, &8]);
806810
# });
807811
```
808812
"#]

0 commit comments

Comments
 (0)