aboutsummaryrefslogtreecommitdiff
path: root/src/future/option.rs
diff options
context:
space:
mode:
authorJoel Galenson <jgalenson@google.com>2021-10-12 15:03:42 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-12 15:03:42 +0000
commit1ebf6047b9f9d3900db00deb117b81e82ea3904f (patch)
tree630ac4f8f0e947984e7ee872e9d0ee74cf0f047e /src/future/option.rs
parent50ca4591e06ed2d193b54dbae47686180c3f24e1 (diff)
parent67b7ffd62996a8b094a119cf0945c072ff8d6f67 (diff)
downloadfutures-util-1ebf6047b9f9d3900db00deb117b81e82ea3904f.tar.gz
Merge "Upgrade rust/crates/futures-util to 0.3.17" am: 67b7ffd629
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-util/+/1833615 Change-Id: I1b436d5a37019f89ad20c75b99178e3fa837cfe2
Diffstat (limited to 'src/future/option.rs')
-rw-r--r--src/future/option.rs6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/future/option.rs b/src/future/option.rs
index 426fe50..0bc3777 100644
--- a/src/future/option.rs
+++ b/src/future/option.rs
@@ -31,6 +31,12 @@ pin_project! {
}
}
+impl<F> Default for OptionFuture<F> {
+ fn default() -> Self {
+ Self { inner: None }
+ }
+}
+
impl<F: Future> Future for OptionFuture<F> {
type Output = Option<F::Output>;