Skip to content

Commit f440dd6

Browse files
ebkalderoncramertj
authored andcommitted
Eliminate unnecessary Result inside ElemState::Done
1 parent 7afb154 commit f440dd6

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

futures-util/src/try_future/try_join_all.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ where
1616
F: TryFuture,
1717
{
1818
Pending(F),
19-
Done(Option<Result<F::Ok, F::Error>>),
19+
Done(Option<F::Ok>),
2020
}
2121

2222
impl<F> ElemState<F>
@@ -32,7 +32,7 @@ where
3232
}
3333
}
3434

35-
fn take_done(self: Pin<&mut Self>) -> Option<Result<F::Ok, F::Error>> {
35+
fn take_done(self: Pin<&mut Self>) -> Option<F::Ok> {
3636
// Safety: Going from pin to a variant we never pin-project
3737
match unsafe { self.get_unchecked_mut() } {
3838
ElemState::Pending(_) => None,
@@ -148,7 +148,7 @@ where
148148
match pending.try_poll(lw) {
149149
Poll::Pending => state = FinalState::Pending,
150150
Poll::Ready(output) => match output {
151-
Ok(item) => elem.set(ElemState::Done(Some(Ok(item)))),
151+
Ok(item) => elem.set(ElemState::Done(Some(item))),
152152
Err(e) => {
153153
state = FinalState::Error(e);
154154
break;
@@ -162,10 +162,10 @@ where
162162
FinalState::Pending => Poll::Pending,
163163
FinalState::AllDone => {
164164
let mut elems = mem::replace(&mut self.elems, Box::pin([]));
165-
let result = iter_pin_mut(elems.as_mut())
165+
let results = iter_pin_mut(elems.as_mut())
166166
.map(|e| e.take_done().unwrap())
167167
.collect();
168-
Poll::Ready(result)
168+
Poll::Ready(Ok(results))
169169
},
170170
FinalState::Error(e) => {
171171
let _ = mem::replace(&mut self.elems, Box::pin([]));

0 commit comments

Comments
 (0)