about summary refs log tree commit diff
path: root/src/libcore/future
diff options
context:
space:
mode:
authorTaylor Cramer <cramertj@google.com>2018-07-30 09:13:30 -0700
committerTaylor Cramer <cramertj@google.com>2018-07-30 09:42:34 -0700
commitcbbcecbee065d4031618615365b0d234fe5b112b (patch)
tree6e451c8a119fc1c3bb6505f3589a57592ac0995f /src/libcore/future
parent54628c8ea844956f3f4f416b82067c634eb09f7b (diff)
downloadrust-cbbcecbee065d4031618615365b0d234fe5b112b.tar.gz
rust-cbbcecbee065d4031618615365b0d234fe5b112b.zip
Implement Unpin for FutureObj and LocalFutureObj
Diffstat (limited to 'src/libcore/future')
-rw-r--r--src/libcore/future/future_obj.rs3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libcore/future/future_obj.rs b/src/libcore/future/future_obj.rs
index 98c504a3f7b..6045fac2b4b 100644
--- a/src/libcore/future/future_obj.rs
+++ b/src/libcore/future/future_obj.rs
@@ -36,6 +36,8 @@ pub struct LocalFutureObj<'a, T> {
     _marker: PhantomData<&'a ()>,
 }
 
+impl<'a, T> Unpin for LocalFutureObj<'a, T> {}
+
 impl<'a, T> LocalFutureObj<'a, T> {
     /// Create a `LocalFutureObj` from a custom trait object representation.
     #[inline]
@@ -104,6 +106,7 @@ impl<'a, T> Drop for LocalFutureObj<'a, T> {
 ///   information #44874)
 pub struct FutureObj<'a, T>(LocalFutureObj<'a, T>);
 
+impl<'a, T> Unpin for FutureObj<'a, T> {}
 unsafe impl<'a, T> Send for FutureObj<'a, T> {}
 
 impl<'a, T> FutureObj<'a, T> {