Mirrors/bevy
2
0
Fork 0
mirror of https://github.com/bevyengine/bevy synced 2024-11-10 15:14:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Relax more Sync bounds on Local (#9589)

Browse source 
# Objective

#5483 allows for the creation of non-`Sync` locals. However, it's not
actually possible to use these types as there is a `Sync` bound on the
`Deref` impls.

## Solution

Remove the unnecessary bounds.
This commit is contained in:
Joseph 2023-08-28 10:47:15 -07:00 committed by GitHub
parent 4e59671ae7
commit da8ab16d83
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
crates/bevy_ecs/src/system/system_param.rs
View file

@ -685,7 +685,7 @@ pub struct Local<'s, T: FromWorld + Send + 'static>(pub(crate) &'s mut T);
// SAFETY: Local only accesses internal state
unsafe impl<'s, T: FromWorld + Send + 'static> ReadOnlySystemParam for Local<'s, T> {}
impl<'s, T: FromWorld + Send + Sync + 'static> Deref for Local<'s, T> {
impl<'s, T: FromWorld + Send + 'static> Deref for Local<'s, T> {
type Target = T;
#[inline]
@ -694,7 +694,7 @@ impl<'s, T: FromWorld + Send + Sync + 'static> Deref for Local<'s, T> {
}
}
impl<'s, T: FromWorld + Send + Sync + 'static> DerefMut for Local<'s, T> {
impl<'s, T: FromWorld + Send + 'static> DerefMut for Local<'s, T> {
#[inline]
fn deref_mut(&mut self) -> &mut Self::Target {
self.0
@ -1560,7 +1560,7 @@ mod tests {
query::{ReadOnlyWorldQuery, WorldQuery},
system::{assert_is_system, Query},
};
use std::marker::PhantomData;
use std::{cell::RefCell, marker::PhantomData};
// Compile test for https://github.com/bevyengine/bevy/pull/2838.
#[test]
@ -1726,4 +1726,17 @@ mod tests {
fn my_system(_: InvariantParam) {}
assert_is_system(my_system);
}
// Compile test for https://github.com/bevyengine/bevy/pull/9589.
#[test]
fn non_sync_local() {
fn non_sync_system(cell: Local<RefCell<u8>>) {
assert_eq!(*cell.borrow(), 0);
}
let mut world = World::new();
let mut schedule = crate::schedule::Schedule::new();
schedule.add_systems(non_sync_system);
schedule.run(&mut world);
}
}