mirror of
https://github.com/bevyengine/bevy
synced 2024-12-23 19:43:07 +00:00
a830530be4
# Objective First of all, this PR took heavy inspiration from #7760 and #5715. It intends to also fix #5569, but with a slightly different approach. This also fixes #9335 by reexporting `DynEq`. ## Solution The advantage of this API is that we can intern a value without allocating for zero-sized-types and for enum variants that have no fields. This PR does this automatically in the `SystemSet` and `ScheduleLabel` derive macros for unit structs and fieldless enum variants. So this should cover many internal and external use cases of `SystemSet` and `ScheduleLabel`. In these optimal use cases, no memory will be allocated. - The interning returns a `Interned<dyn SystemSet>`, which is just a wrapper around a `&'static dyn SystemSet`. - `Hash` and `Eq` are implemented in terms of the pointer value of the reference, similar to my first approach of anonymous system sets in #7676. - Therefore, `Interned<T>` does not implement `Borrow<T>`, only `Deref`. - The debug output of `Interned<T>` is the same as the interned value. Edit: - `AppLabel` is now also interned and the old `derive_label`/`define_label` macros were replaced with the new interning implementation. - Anonymous set ids are reused for different `Schedule`s, reducing the amount of leaked memory. ### Pros - `InternedSystemSet` and `InternedScheduleLabel` behave very similar to the current `BoxedSystemSet` and `BoxedScheduleLabel`, but can be copied without an allocation. - Many use cases don't allocate at all. - Very fast lookups and comparisons when using `InternedSystemSet` and `InternedScheduleLabel`. - The `intern` module might be usable in other areas. - `Interned{ScheduleLabel, SystemSet, AppLabel}` does implement `{ScheduleLabel, SystemSet, AppLabel}`, increasing ergonomics. ### Cons - Implementors of `SystemSet` and `ScheduleLabel` still need to implement `Hash` and `Eq` (and `Clone`) for it to work. ## Changelog ### Added - Added `intern` module to `bevy_utils`. - Added reexports of `DynEq` to `bevy_ecs` and `bevy_app`. ### Changed - Replaced `BoxedSystemSet` and `BoxedScheduleLabel` with `InternedSystemSet` and `InternedScheduleLabel`. - Replaced `impl AsRef<dyn ScheduleLabel>` with `impl ScheduleLabel`. - Replaced `AppLabelId` with `InternedAppLabel`. - Changed `AppLabel` to use `Debug` for error messages. - Changed `AppLabel` to use interning. - Changed `define_label`/`derive_label` to use interning. - Replaced `define_boxed_label`/`derive_boxed_label` with `define_label`/`derive_label`. - Changed anonymous set ids to be only unique inside a schedule, not globally. - Made interned label types implement their label trait. ### Removed - Removed `define_boxed_label` and `derive_boxed_label`. ## Migration guide - Replace `BoxedScheduleLabel` and `Box<dyn ScheduleLabel>` with `InternedScheduleLabel` or `Interned<dyn ScheduleLabel>`. - Replace `BoxedSystemSet` and `Box<dyn SystemSet>` with `InternedSystemSet` or `Interned<dyn SystemSet>`. - Replace `AppLabelId` with `InternedAppLabel` or `Interned<dyn AppLabel>`. - Types manually implementing `ScheduleLabel`, `AppLabel` or `SystemSet` need to implement: - `dyn_hash` directly instead of implementing `DynHash` - `as_dyn_eq` - Pass labels to `World::try_schedule_scope`, `World::schedule_scope`, `World::try_run_schedule`. `World::run_schedule`, `Schedules::remove`, `Schedules::remove_entry`, `Schedules::contains`, `Schedules::get` and `Schedules::get_mut` by value instead of by reference. --------- Co-authored-by: Joseph <21144246+JoJoJet@users.noreply.github.com> Co-authored-by: Carter Anderson <mcanders1@gmail.com>
100 lines
3.5 KiB
Rust
100 lines
3.5 KiB
Rust
use proc_macro::{TokenStream, TokenTree};
|
|
use quote::{quote, quote_spanned};
|
|
use rustc_hash::FxHashSet;
|
|
use syn::{spanned::Spanned, Ident};
|
|
|
|
/// Finds an identifier that will not conflict with the specified set of tokens.
|
|
/// If the identifier is present in `haystack`, extra characters will be added
|
|
/// to it until it no longer conflicts with anything.
|
|
///
|
|
/// Note that the returned identifier can still conflict in niche cases,
|
|
/// such as if an identifier in `haystack` is hidden behind an un-expanded macro.
|
|
pub fn ensure_no_collision(value: Ident, haystack: TokenStream) -> Ident {
|
|
// Collect all the identifiers in `haystack` into a set.
|
|
let idents = {
|
|
// List of token streams that will be visited in future loop iterations.
|
|
let mut unvisited = vec![haystack];
|
|
// Identifiers we have found while searching tokens.
|
|
let mut found = FxHashSet::default();
|
|
while let Some(tokens) = unvisited.pop() {
|
|
for t in tokens {
|
|
match t {
|
|
// Collect any identifiers we encounter.
|
|
TokenTree::Ident(ident) => {
|
|
found.insert(ident.to_string());
|
|
}
|
|
// Queue up nested token streams to be visited in a future loop iteration.
|
|
TokenTree::Group(g) => unvisited.push(g.stream()),
|
|
TokenTree::Punct(_) | TokenTree::Literal(_) => {}
|
|
}
|
|
}
|
|
}
|
|
|
|
found
|
|
};
|
|
|
|
let span = value.span();
|
|
|
|
// If there's a collision, add more characters to the identifier
|
|
// until it doesn't collide with anything anymore.
|
|
let mut value = value.to_string();
|
|
while idents.contains(&value) {
|
|
value.push('X');
|
|
}
|
|
|
|
Ident::new(&value, span)
|
|
}
|
|
|
|
/// Derive a label trait
|
|
///
|
|
/// # Args
|
|
///
|
|
/// - `input`: The [`syn::DeriveInput`] for struct that is deriving the label trait
|
|
/// - `trait_name`: Name of the label trait
|
|
/// - `trait_path`: The [path](`syn::Path`) to the label trait
|
|
/// - `dyn_eq_path`: The [path](`syn::Path`) to the `DynEq` trait
|
|
pub fn derive_label(
|
|
input: syn::DeriveInput,
|
|
trait_name: &str,
|
|
trait_path: &syn::Path,
|
|
dyn_eq_path: &syn::Path,
|
|
) -> TokenStream {
|
|
if let syn::Data::Union(_) = &input.data {
|
|
let message = format!("Cannot derive {trait_name} for unions.");
|
|
return quote_spanned! {
|
|
input.span() => compile_error!(#message);
|
|
}
|
|
.into();
|
|
}
|
|
|
|
let ident = input.ident.clone();
|
|
let (impl_generics, ty_generics, where_clause) = input.generics.split_for_impl();
|
|
let mut where_clause = where_clause.cloned().unwrap_or_else(|| syn::WhereClause {
|
|
where_token: Default::default(),
|
|
predicates: Default::default(),
|
|
});
|
|
where_clause.predicates.push(
|
|
syn::parse2(quote! {
|
|
Self: 'static + Send + Sync + Clone + Eq + ::std::fmt::Debug + ::std::hash::Hash
|
|
})
|
|
.unwrap(),
|
|
);
|
|
(quote! {
|
|
impl #impl_generics #trait_path for #ident #ty_generics #where_clause {
|
|
fn dyn_clone(&self) -> ::std::boxed::Box<dyn #trait_path> {
|
|
::std::boxed::Box::new(::std::clone::Clone::clone(self))
|
|
}
|
|
|
|
fn as_dyn_eq(&self) -> &dyn #dyn_eq_path {
|
|
self
|
|
}
|
|
|
|
fn dyn_hash(&self, mut state: &mut dyn ::std::hash::Hasher) {
|
|
let ty_id = ::std::any::TypeId::of::<Self>();
|
|
::std::hash::Hash::hash(&ty_id, &mut state);
|
|
::std::hash::Hash::hash(self, &mut state);
|
|
}
|
|
}
|
|
})
|
|
.into()
|
|
}
|