Rollup merge of #52870 - cramertj:unpin-futureobj, r=aturon

Implement Unpin for FutureObj and LocalFutureObj cc @MajorBreakfast r? @aturon
rust-lang · Jul 30, 2018 · 415cc0d · 415cc0d
2 parents 97cb818 + cbbcecb
commit 415cc0d
Showing 1 changed file with 3 additions and 0 deletions.
diff --git 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> {