about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorJosef Reinhard Brandl <mail@josefbrandl.de>2018-07-02 18:57:58 +0200
committerJosef Reinhard Brandl <mail@josefbrandl.de>2018-07-02 18:57:58 +0200
commit5fde8b92372f02deaf5c7fb638447a60112f9015 (patch)
treee25f596491b31b8c0dd6d6b38477b454e0963092 /src
parentcb2c7570db807eab35b3decd813f5cbec844ddb3 (diff)
downloadrust-5fde8b92372f02deaf5c7fb638447a60112f9015.tar.gz
rust-5fde8b92372f02deaf5c7fb638447a60112f9015.zip
Remove unnecessary `PhantomData` field
Diffstat (limited to 'src')
-rw-r--r--src/libcore/future/future_obj.rs6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/libcore/future/future_obj.rs b/src/libcore/future/future_obj.rs
index 173e381ca50..99f21272538 100644
--- a/src/libcore/future/future_obj.rs
+++ b/src/libcore/future/future_obj.rs
@@ -33,8 +33,7 @@ pub struct LocalFutureObj<'a, T> {
     ptr: *mut (),
     poll_fn: unsafe fn(*mut (), &mut Context) -> Poll<T>,
     drop_fn: unsafe fn(*mut ()),
-    _marker1: PhantomData<T>,
-    _marker2: PhantomData<&'a ()>,
+    _marker: PhantomData<&'a ()>,
 }
 
 impl<'a, T> LocalFutureObj<'a, T> {
@@ -45,8 +44,7 @@ impl<'a, T> LocalFutureObj<'a, T> {
             ptr: f.into_raw(),
             poll_fn: F::poll,
             drop_fn: F::drop,
-            _marker1: PhantomData,
-            _marker2: PhantomData,
+            _marker: PhantomData,
         }
     }