mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add PhantomData marker to Context to make Context !Send and !Sync

Browse source
This commit is contained in:
James Higgins 2022-04-12 13:54:36 -03:00 • committed by David Tolnay
parent fb9dfa8cef
commit fd59b628ea
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
library/core/src/task/wake.rs
View file

@ -181,6 +181,9 @@ pub struct Context<'a> {
// are contravariant while return-position lifetimes are // are contravariant while return-position lifetimes are
// covariant). // covariant).
_marker: PhantomData<fn(&'a ()) -> &'a ()>, _marker: PhantomData<fn(&'a ()) -> &'a ()>,
// Ensure `Context` is `!Send` and `!Sync` in order to allow
// for future `!Send` and / or `!Sync` fields.
_marker2: PhantomData<*mut ()>,
} }
impl<'a> Context<'a> { impl<'a> Context<'a> {
@ -190,7 +193,7 @@ impl<'a> Context<'a> {
#[must_use] #[must_use]
#[inline] #[inline]
pub const fn from_waker(waker: &'a Waker) -> Self { pub const fn from_waker(waker: &'a Waker) -> Self {
Context { waker, _marker: PhantomData } Context { waker, _marker: PhantomData, _marker2: PhantomData }
} }
/// Returns a reference to the [`Waker`] for the current task. /// Returns a reference to the [`Waker`] for the current task.