Skip to content

Commit d382a88

Browse files
Rollup merge of rust-lang#52870 - cramertj:unpin-futureobj, r=aturon
Implement Unpin for FutureObj and LocalFutureObj cc @MajorBreakfast r? @aturon
2 parents 258314b + cbbcecb commit d382a88

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

Diff for: src/libcore/future/future_obj.rs

+3
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ pub struct LocalFutureObj<'a, T> {
3636
_marker: PhantomData<&'a ()>,
3737
}
3838

39+
impl<'a, T> Unpin for LocalFutureObj<'a, T> {}
40+
3941
impl<'a, T> LocalFutureObj<'a, T> {
4042
/// Create a `LocalFutureObj` from a custom trait object representation.
4143
#[inline]
@@ -104,6 +106,7 @@ impl<'a, T> Drop for LocalFutureObj<'a, T> {
104106
/// information #44874)
105107
pub struct FutureObj<'a, T>(LocalFutureObj<'a, T>);
106108

109+
impl<'a, T> Unpin for FutureObj<'a, T> {}
107110
unsafe impl<'a, T> Send for FutureObj<'a, T> {}
108111

109112
impl<'a, T> FutureObj<'a, T> {

0 commit comments

Comments
 (0)