Skip to content

Commit 25b1149

Browse files
aobatactjswrenn
authored andcommitted
Fix remove use of fuse at tuple_windows
1 parent 6c6aa7e commit 25b1149

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

src/tuple_impl.rs

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ where
167167
I: Iterator<Item = T::Item>,
168168
T: HomogeneousTuple,
169169
{
170-
iter: Fuse<I>,
170+
iter: I,
171171
last: Option<T>,
172172
}
173173

@@ -180,7 +180,7 @@ where
180180
{
181181
TupleWindows {
182182
last : None,
183-
iter : iter.fuse(),
183+
iter,
184184
}
185185
}
186186

@@ -196,20 +196,19 @@ where
196196
if T::num_items() == 1 {
197197
return T::collect_from_iter_no_buf(&mut self.iter);
198198
}
199-
if let Some(ref mut last) = self.last {
200-
if let Some(new) = self.iter.next() {
199+
if let Some(new) = self.iter.next() {
200+
if let Some(ref mut last) = self.last {
201201
last.left_shift_push(new);
202-
return Some(last.clone());
203-
}
204-
} else {
205-
use std::iter::once;
206-
if let Some(item) = self.iter.next() {
207-
let iter = once(item).chain(&mut self.iter);
202+
Some(last.clone())
203+
} else {
204+
use std::iter::once;
205+
let iter = once(new).chain(&mut self.iter);
208206
self.last = T::collect_from_iter_no_buf(iter);
209-
return self.last.clone();
207+
self.last.clone()
210208
}
209+
} else {
210+
None
211211
}
212-
None
213212
}
214213

215214
fn size_hint(&self) -> (usize, Option<usize>) {

0 commit comments

Comments
 (0)