forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Relaxed bounds on NonSend. (#1448)

Browse Source
This commit is contained in:
Alexander Sepity 2021-02-15 03:20:16 +03:00 committed by GitHub
parent f8292ccf7e
commit d021a3c374
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crates/bevy_ecs/src/resource/resource_query.rs
View File

@ -136,12 +136,12 @@ impl<'a, T: Resource + FromResources> DerefMut for Local<'a, T> {
/// `NonSend<T>` resources cannot leave the main thread, so any system that wants access to /// `NonSend<T>` resources cannot leave the main thread, so any system that wants access to
/// a non-send resource will run on the main thread. See `Resources::insert_non_send()` and friends. /// a non-send resource will run on the main thread. See `Resources::insert_non_send()` and friends.
#[derive(Debug)] #[derive(Debug)]
pub struct NonSend<'a, T: Resource> { pub struct NonSend<'a, T: 'static> {
value: *mut T, value: *mut T,
_marker: PhantomData<&'a T>, _marker: PhantomData<&'a T>,
} }
impl<'a, T: Resource> NonSend<'a, T> { impl<'a, T: 'static> NonSend<'a, T> {
pub(crate) unsafe fn new(resources: &Resources) -> Self { pub(crate) unsafe fn new(resources: &Resources) -> Self {
NonSend { NonSend {
value: resources.get_unsafe_non_send_ref::<T>().as_ptr(), value: resources.get_unsafe_non_send_ref::<T>().as_ptr(),
@ -150,7 +150,7 @@ impl<'a, T: Resource> NonSend<'a, T> {
} }
} }
impl<'a, T: Resource> Deref for NonSend<'a, T> { impl<'a, T: 'static> Deref for NonSend<'a, T> {
type Target = T; type Target = T;
fn deref(&self) -> &T { fn deref(&self) -> &T {
@ -158,7 +158,7 @@ impl<'a, T: Resource> Deref for NonSend<'a, T> {
} }
} }
impl<'a, T: Resource> DerefMut for NonSend<'a, T> { impl<'a, T: 'static> DerefMut for NonSend<'a, T> {
fn deref_mut(&mut self) -> &mut T { fn deref_mut(&mut self) -> &mut T {
unsafe { &mut *self.value } unsafe { &mut *self.value }
} }