Switch to on demand tracking

Instead of being on the component type, tracking is set on the view
leudz · Feb 3, 2023 · 0e2d67a · 0e2d67a
1 parent f6adbc2
commit 0e2d67a
Show file tree

Hide file tree

Showing 96 changed files with 3,013 additions and 3,949 deletions.
diff --git a/shipyard_proc/src/component_expand.rs b/shipyard_proc/src/component_expand.rs
@@ -1,77 +1,18 @@
 use proc_macro2::TokenStream;
 use quote::quote;
-use syn::{Error, Result};
-
-pub(crate) fn expand_component(
-    name: syn::Ident,
-    generics: syn::Generics,
-    attribute_input: Option<&syn::Attribute>,
-) -> Result<TokenStream> {
-    let tracking = if let Some(tracking_attr) = attribute_input {
-        let tracking: syn::Ident = tracking_attr.parse_args().map_err(|_| {
-            Error::new_spanned(
-                &tracking_attr.tokens,
-                "Track should be one of: Untracked, Insertion, Modification, Deletion, Removal or All.",
-            )
-        })?;
-
-        let tracking_name = tracking.to_string();
-
-        match tracking_name.as_str() {
-            "Untracked" | "Insertion" | "Modification" | "Deletion" | "Removal" | "All" => {}
-            _ => return Err(Error::new_spanned(
-                &tracking,
-                "Track should be one of: Untracked, Insertion, Modification, Deletion, Removal or All.",
-            )),
-        }
-
-        quote!(#tracking)
-    } else {
-        quote!(Untracked)
-    };
 
+pub(crate) fn expand_component(name: syn::Ident, generics: syn::Generics) -> TokenStream {
     let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
 
-    Ok(quote!(
-        impl #impl_generics ::shipyard::Component for #name #ty_generics #where_clause {
-            type Tracking = ::shipyard::track::#tracking;
-        }
-    ))
+    quote!(
+        impl #impl_generics ::shipyard::Component for #name #ty_generics #where_clause {}
+    )
 }
 
-pub(crate) fn expand_unique(
-    name: syn::Ident,
-    generics: syn::Generics,
-    attribute_input: Option<&syn::Attribute>,
-) -> Result<TokenStream> {
-    let tracking = if let Some(tracking_attr) = attribute_input {
-        let tracking: syn::Ident = tracking_attr.parse_args().map_err(|_| {
-            Error::new_spanned(
-                &tracking_attr.tokens,
-                "Track should be one of: Untracked, Insertion, Modification, Deletion, Removal or All.",
-            )
-        })?;
-
-        let tracking_name = tracking.to_string();
-
-        match tracking_name.as_str() {
-            "Untracked" | "Insertion" | "Modification" | "Deletion" | "Removal" | "All" => {}
-            _ => return Err(Error::new_spanned(
-                &tracking,
-                "Track should be one of: Untracked, Insertion, Modification, Deletion, Removal or All.",
-            )),
-        }
-
-        quote!(#tracking)
-    } else {
-        quote!(Untracked)
-    };
-
+pub(crate) fn expand_unique(name: syn::Ident, generics: syn::Generics) -> TokenStream {
     let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
 
-    Ok(quote!(
-        impl #impl_generics ::shipyard::Unique for #name #ty_generics #where_clause {
-            type Tracking = ::shipyard::track::#tracking;
-        }
-    ))
+    quote!(
+        impl #impl_generics ::shipyard::Unique for #name #ty_generics #where_clause {}
+    )
 }
diff --git a/shipyard_proc/src/lib.rs b/shipyard_proc/src/lib.rs
@@ -17,18 +17,7 @@ pub fn component(item: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let name = input.ident;
     let generics = input.generics;
 
-    let attribute_input: Option<&syn::Attribute> = input
-        .attrs
-        .iter()
-        .filter(|attr| match attr.style {
-            syn::AttrStyle::Outer => true,
-            syn::AttrStyle::Inner(_) => false,
-        })
-        .find(|attr| attr.path.get_ident().map(ToString::to_string) == Some("track".to_string()));
-
-    expand_component(name, generics, attribute_input)
-        .unwrap_or_else(|err| err.to_compile_error())
-        .into()
+    expand_component(name, generics).into()
 }
 
 #[proc_macro_derive(Unique, attributes(track))]
@@ -38,18 +27,7 @@ pub fn unique(item: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let name = input.ident;
     let generics = input.generics;
 
-    let attribute_input: Option<&syn::Attribute> = input
-        .attrs
-        .iter()
-        .filter(|attr| match attr.style {
-            syn::AttrStyle::Outer => true,
-            syn::AttrStyle::Inner(_) => false,
-        })
-        .find(|attr| attr.path.get_ident().map(ToString::to_string) == Some("track".to_string()));
-
-    expand_unique(name, generics, attribute_input)
-        .unwrap_or_else(|err| err.to_compile_error())
-        .into()
+    expand_unique(name, generics).into()
 }
 
 #[proc_macro_derive(Borrow, attributes(shipyard))]

diff --git a/src/add_component.rs b/src/add_component.rs
@@ -36,7 +36,7 @@ impl AddComponent for () {
     fn add_component_unchecked(&mut self, _: EntityId, _: Self::Component) {}
 }
 
-impl<T: Component> AddComponent for ViewMut<'_, T> {
+impl<T: Component, const TRACK: u32> AddComponent for ViewMut<'_, T, TRACK> {
     type Component = T;
 
     #[inline]
@@ -46,7 +46,7 @@ impl<T: Component> AddComponent for ViewMut<'_, T> {
     }
 }
 
-impl<T: Component> AddComponent for &mut ViewMut<'_, T> {
+impl<T: Component, const TRACK: u32> AddComponent for &mut ViewMut<'_, T, TRACK> {
     type Component = T;
 
     #[inline]

diff --git a/src/add_entity.rs b/src/add_entity.rs
@@ -18,7 +18,7 @@ impl AddEntity for () {
     fn add_entity(_: &mut Self, _: EntityId, _: Self::Component) {}
 }
 
-impl<T: Component> AddEntity for ViewMut<'_, T> {
+impl<T: Component, const TRACK: u32> AddEntity for ViewMut<'_, T, TRACK> {
     type Component = T;
 
     #[inline]
@@ -27,7 +27,7 @@ impl<T: Component> AddEntity for ViewMut<'_, T> {
     }
 }
 
-impl<T: Component> AddEntity for &mut ViewMut<'_, T> {
+impl<T: Component, const TRACK: u32> AddEntity for &mut ViewMut<'_, T, TRACK> {
     type Component = T;
 
     #[inline]

diff --git a/src/all_storages/custom_storage.rs b/src/all_storages/custom_storage.rs
@@ -147,10 +147,10 @@ pub trait CustomStorageAccess {
     ///
     /// [`RefMut`]: crate::atomic_refcell::RefMut
     #[cfg(feature = "thread_local")]
-    fn custom_storage_or_insert_non_send_mut<'a, S, F>(
-        &'a self,
+    fn custom_storage_or_insert_non_send_mut<S, F>(
+        &self,
         f: F,
-    ) -> Result<RefMut<'a, &'a mut S>, error::GetStorage>
+    ) -> Result<RefMut<'_, &'_ mut S>, error::GetStorage>
     where
         S: 'static + Storage + Sync,
         F: FnOnce() -> S;
@@ -159,22 +159,22 @@ pub trait CustomStorageAccess {
     /// [`RefMut`]: crate::atomic_refcell::RefMut
     /// [`StorageId`]: crate::storage::StorageId
     #[cfg(feature = "thread_local")]
-    fn custom_storage_or_insert_non_send_mut_by_id<'a, S, F>(
-        &'a self,
+    fn custom_storage_or_insert_non_send_mut_by_id<S, F>(
+        &self,
         storage_id: StorageId,
         f: F,
-    ) -> Result<RefMut<'a, &'a mut S>, error::GetStorage>
+    ) -> Result<RefMut<'_, &'_ mut S>, error::GetStorage>
     where
         S: 'static + Storage + Sync,
         F: FnOnce() -> S;
     /// Returns a [`RefMut`] to the requested `S` storage and create it if it does not exist.
     ///
     /// [`RefMut`]: crate::atomic_refcell::RefMut
     #[cfg(feature = "thread_local")]
-    fn custom_storage_or_insert_non_sync_mut<'a, S, F>(
-        &'a self,
+    fn custom_storage_or_insert_non_sync_mut<S, F>(
+        &self,
         f: F,
-    ) -> Result<RefMut<'a, &'a mut S>, error::GetStorage>
+    ) -> Result<RefMut<'_, &'_ mut S>, error::GetStorage>
     where
         S: 'static + Storage + Send,
         F: FnOnce() -> S;
@@ -183,22 +183,22 @@ pub trait CustomStorageAccess {
     /// [`RefMut`]: crate::atomic_refcell::RefMut
     /// [`StorageId`]: crate::storage::StorageId
     #[cfg(feature = "thread_local")]
-    fn custom_storage_or_insert_non_sync_mut_by_id<'a, S, F>(
-        &'a self,
+    fn custom_storage_or_insert_non_sync_mut_by_id<S, F>(
+        &self,
         storage_id: StorageId,
         f: F,
-    ) -> Result<RefMut<'a, &'a mut S>, error::GetStorage>
+    ) -> Result<RefMut<'_, &'_ mut S>, error::GetStorage>
     where
         S: 'static + Storage + Send,
         F: FnOnce() -> S;
     /// Returns a [`RefMut`] to the requested `S` storage and create it if it does not exist.
     ///
     /// [`RefMut`]: crate::atomic_refcell::RefMut
     #[cfg(feature = "thread_local")]
-    fn custom_storage_or_insert_non_send_sync_mut<'a, S, F>(
-        &'a self,
+    fn custom_storage_or_insert_non_send_sync_mut<S, F>(
+        &self,
         f: F,
-    ) -> Result<RefMut<'a, &'a mut S>, error::GetStorage>
+    ) -> Result<RefMut<'_, &'_ mut S>, error::GetStorage>
     where
         S: 'static + Storage,
         F: FnOnce() -> S;
@@ -207,11 +207,11 @@ pub trait CustomStorageAccess {
     /// [`RefMut`]: crate::atomic_refcell::RefMut
     /// [`StorageId`]: crate::storage::StorageId
     #[cfg(feature = "thread_local")]
-    fn custom_storage_or_insert_non_send_sync_mut_by_id<'a, S, F>(
-        &'a self,
+    fn custom_storage_or_insert_non_send_sync_mut_by_id<S, F>(
+        &self,
         storage_id: StorageId,
         f: F,
-    ) -> Result<RefMut<'a, &'a mut S>, error::GetStorage>
+    ) -> Result<RefMut<'_, &'_ mut S>, error::GetStorage>
     where
         S: 'static + Storage,
         F: FnOnce() -> S;
@@ -614,22 +614,22 @@ impl CustomStorageAccess for AllStorages {
     }
     #[cfg(feature = "thread_local")]
     #[inline]
-    fn custom_storage_or_insert_non_send_mut<'a, S, F>(
-        &'a self,
+    fn custom_storage_or_insert_non_send_mut<S, F>(
+        &self,
         f: F,
-    ) -> Result<RefMut<'a, &'a mut S>, error::GetStorage>
+    ) -> Result<RefMut<'_, &'_ mut S>, error::GetStorage>
     where
         S: 'static + Storage + Sync,
         F: FnOnce() -> S,
     {
         self.custom_storage_or_insert_non_send_mut_by_id(StorageId::of::<S>(), f)
     }
     #[cfg(feature = "thread_local")]
-    fn custom_storage_or_insert_non_send_mut_by_id<'a, S, F>(
-        &'a self,
+    fn custom_storage_or_insert_non_send_mut_by_id<S, F>(
+        &self,
         storage_id: StorageId,
         f: F,
-    ) -> Result<RefMut<'a, &'a mut S>, error::GetStorage>
+    ) -> Result<RefMut<'_, &'_ mut S>, error::GetStorage>
     where
         S: 'static + Storage + Sync,
         F: FnOnce() -> S,
@@ -681,22 +681,22 @@ impl CustomStorageAccess for AllStorages {
     }
     #[cfg(feature = "thread_local")]
     #[inline]
-    fn custom_storage_or_insert_non_sync_mut<'a, S, F>(
-        &'a self,
+    fn custom_storage_or_insert_non_sync_mut<S, F>(
+        &self,
         f: F,
-    ) -> Result<RefMut<'a, &'a mut S>, error::GetStorage>
+    ) -> Result<RefMut<'_, &'_ mut S>, error::GetStorage>
     where
         S: 'static + Storage + Send,
         F: FnOnce() -> S,
     {
         self.custom_storage_or_insert_non_sync_mut_by_id(StorageId::of::<S>(), f)
     }
     #[cfg(feature = "thread_local")]
-    fn custom_storage_or_insert_non_sync_mut_by_id<'a, S, F>(
-        &'a self,
+    fn custom_storage_or_insert_non_sync_mut_by_id<S, F>(
+        &self,
         storage_id: StorageId,
         f: F,
-    ) -> Result<RefMut<'a, &'a mut S>, error::GetStorage>
+    ) -> Result<RefMut<'_, &'_ mut S>, error::GetStorage>
     where
         S: 'static + Storage + Send,
         F: FnOnce() -> S,
@@ -740,22 +740,22 @@ impl CustomStorageAccess for AllStorages {
     }
     #[cfg(feature = "thread_local")]
     #[inline]
-    fn custom_storage_or_insert_non_send_sync_mut<'a, S, F>(
-        &'a self,
+    fn custom_storage_or_insert_non_send_sync_mut<S, F>(
+        &self,
         f: F,
-    ) -> Result<RefMut<'a, &'a mut S>, error::GetStorage>
+    ) -> Result<RefMut<'_, &'_ mut S>, error::GetStorage>
     where
         S: 'static + Storage,
         F: FnOnce() -> S,
     {
         self.custom_storage_or_insert_non_send_sync_mut_by_id(StorageId::of::<S>(), f)
     }
     #[cfg(feature = "thread_local")]
-    fn custom_storage_or_insert_non_send_sync_mut_by_id<'a, S, F>(
-        &'a self,
+    fn custom_storage_or_insert_non_send_sync_mut_by_id<S, F>(
+        &self,
         storage_id: StorageId,
         f: F,
-    ) -> Result<RefMut<'a, &'a mut S>, error::GetStorage>
+    ) -> Result<RefMut<'_, &'_ mut S>, error::GetStorage>
     where
         S: 'static + Storage,
         F: FnOnce() -> S,

diff --git a/src/all_storages/delete_any/custom_delete_any.rs b/src/all_storages/delete_any/custom_delete_any.rs
@@ -13,7 +13,7 @@ impl CustomDeleteAny for () {
     fn delete_any(&mut self, _: &mut HashSet<EntityId>, _current: u32) {}
 }
 
-impl<T: Component> CustomDeleteAny for SparseSet<T, T::Tracking> {
+impl<T: Component> CustomDeleteAny for SparseSet<T> {
     #[inline]
     fn delete_any(&mut self, ids: &mut HashSet<EntityId>, current: u32) {
         ids.extend(&self.dense);