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

Removed once_cell (#10079)

Browse source 
# Objective

- Fixes #8303

## Solution

- Replaced 1 instance of `OnceBox<T>` with `OnceLock<T>` in
`NonGenericTypeCell`

## Notes

All changes are in the private side of Bevy, and appear to have no
observable change in performance or compilation time. This is purely to
reduce the quantity of direct dependencies in Bevy.
This commit is contained in:
Zachary Harrold 2023-10-12 21:20:07 +11:00 committed by GitHub
parent 65d57b9824
commit bb13d065d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
crates/bevy_reflect/Cargo.toml
View file

@ -29,7 +29,6 @@ bevy_ptr = { path = "../bevy_ptr", version = "0.12.0-dev" }
erased-serde = "0.3" erased-serde = "0.3"
downcast-rs = "1.2" downcast-rs = "1.2"
thiserror = "1.0" thiserror = "1.0"
once_cell = "1.11"
serde = "1" serde = "1"
smallvec = { version = "1.6", features = [ smallvec = { version = "1.6", features = [
"serde", "serde",

9
crates/bevy_reflect/src/utility.rs
View file

@ -2,11 +2,10 @@
use crate::TypeInfo; use crate::TypeInfo;
use bevy_utils::{FixedState, StableHashMap}; use bevy_utils::{FixedState, StableHashMap};
use once_cell::race::OnceBox;
use std::{ use std::{
any::{Any, TypeId}, any::{Any, TypeId},
hash::BuildHasher, hash::BuildHasher,
sync::{PoisonError, RwLock}, sync::{OnceLock, PoisonError, RwLock},
}; };
/// A type that can be stored in a ([`Non`])[`GenericTypeCell`]. /// A type that can be stored in a ([`Non`])[`GenericTypeCell`].
@ -89,7 +88,7 @@ mod sealed {
/// ``` /// ```
/// ///
/// [`TypePath`]: crate::TypePath /// [`TypePath`]: crate::TypePath
pub struct NonGenericTypeCell<T: TypedProperty>(OnceBox<T::Stored>); pub struct NonGenericTypeCell<T: TypedProperty>(OnceLock<T::Stored>);
/// See [`NonGenericTypeCell`]. /// See [`NonGenericTypeCell`].
pub type NonGenericTypeInfoCell = NonGenericTypeCell<TypeInfo>; pub type NonGenericTypeInfoCell = NonGenericTypeCell<TypeInfo>;
@ -97,7 +96,7 @@ pub type NonGenericTypeInfoCell = NonGenericTypeCell<TypeInfo>;
impl<T: TypedProperty> NonGenericTypeCell<T> { impl<T: TypedProperty> NonGenericTypeCell<T> {
/// Initialize a [`NonGenericTypeCell`] for non-generic types. /// Initialize a [`NonGenericTypeCell`] for non-generic types.
pub const fn new() -> Self { pub const fn new() -> Self {
Self(OnceBox::new()) Self(OnceLock::new())
} }
/// Returns a reference to the [`TypedProperty`] stored in the cell. /// Returns a reference to the [`TypedProperty`] stored in the cell.
@ -107,7 +106,7 @@ impl<T: TypedProperty> NonGenericTypeCell<T> {
where where
F: FnOnce() -> T::Stored, F: FnOnce() -> T::Stored,
{ {
self.0.get_or_init(|| Box::new(f())) self.0.get_or_init(f)
} }
} }