Skip to content

Commit e85bbe6

Browse files
authored
Merge branch 'master' into stream-cloned
2 parents 8bef812 + 20cdf73 commit e85bbe6

File tree

8 files changed

+262
-371
lines changed

8 files changed

+262
-371
lines changed

src/option/sum.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,10 @@ where
2020
```
2121
# fn main() { async_std::task::block_on(async {
2222
#
23-
use std::collections::VecDeque;
2423
use async_std::prelude::*;
24+
use async_std::stream;
2525
26-
let words: VecDeque<_> = vec!["have", "a", "great", "day"]
27-
.into_iter()
28-
.collect();
26+
let words = stream::from_iter(vec!["have", "a", "great", "day"]);
2927
let total: Option<usize> = words.map(|w| w.find('a')).sum().await;
3028
assert_eq!(total, Some(5));
3129
#

src/result/product.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ where
2020
```
2121
# fn main() { async_std::task::block_on(async {
2222
#
23-
use std::collections::VecDeque;
2423
use async_std::prelude::*;
24+
use async_std::stream;
2525
26-
let v: VecDeque<_> = vec![1, 2, 4].into_iter().collect();
26+
let v = stream::from_iter(vec![1, 2, 4]);
2727
let res: Result<i32, &'static str> = v.map(|x|
2828
if x < 0 {
2929
Err("Negative element found")

src/result/sum.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ where
2020
```
2121
# fn main() { async_std::task::block_on(async {
2222
#
23-
use std::collections::VecDeque;
2423
use async_std::prelude::*;
24+
use async_std::stream;
2525
26-
let v: VecDeque<_> = vec![1, 2].into_iter().collect();
26+
let v = stream::from_iter(vec![1, 2]);
2727
let res: Result<i32, &'static str> = v.map(|x|
2828
if x < 0 {
2929
Err("Negative element found")

src/stream/from_iter.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pin_project! {
1212
/// See it documentation for more.
1313
///
1414
/// [`from_iter`]: fn.from_iter.html
15-
#[derive(Debug)]
15+
#[derive(Clone, Debug)]
1616
pub struct FromIter<I> {
1717
iter: I,
1818
}

0 commit comments

Comments
 (0)