 dc40cd134f
			
		
	
	
		dc40cd134f
		
			
		
	
	
	
	
		
			
			# Objective When doing a final pass for #3362, it appeared that `ComponentStorage` as a trait, the two types implementing it, and the associated type on `Component` aren't really necessary anymore. This likely was due to an earlier constraint on the use of consts in traits, but that definitely doesn't seem to be a problem in Rust 1.76. ## Solution Remove them. --- ## Changelog Changed: `Component::Storage` has been replaced with `Component::STORAGE_TYPE` as a const. Removed: `bevy::ecs::component::ComponentStorage` trait Removed: `bevy::ecs::component::TableStorage` struct Removed: `bevy::ecs::component::SparseSetStorage` struct ## Migration Guide If you were manually implementing `Component` instead of using the derive macro, replace the associated `Storage` associated type with the `STORAGE_TYPE` const: ```rust // in Bevy 0.13 impl Component for MyComponent { type Storage = TableStorage; } // in Bevy 0.14 impl Component for MyComponent { const STORAGE_TYPE: StorageType = StorageType::Table; } ``` Component is no longer object safe. If you were relying on `&dyn Component`, `Box<dyn Component>`, etc. please [file an issue ](https://github.com/bevyengine/bevy/issues) to get [this change](https://github.com/bevyengine/bevy/pull/12311) reverted. --------- Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com>
		
			
				
	
	
		
			120 lines
		
	
	
		
			3.7 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
			
		
		
	
	
			120 lines
		
	
	
		
			3.7 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
| use proc_macro::TokenStream;
 | |
| use proc_macro2::{Span, TokenStream as TokenStream2};
 | |
| use quote::quote;
 | |
| use syn::{parse_macro_input, parse_quote, DeriveInput, Ident, LitStr, Path, Result};
 | |
| 
 | |
| pub fn derive_event(input: TokenStream) -> TokenStream {
 | |
|     let mut ast = parse_macro_input!(input as DeriveInput);
 | |
|     let bevy_ecs_path: Path = crate::bevy_ecs_path();
 | |
| 
 | |
|     ast.generics
 | |
|         .make_where_clause()
 | |
|         .predicates
 | |
|         .push(parse_quote! { Self: Send + Sync + 'static });
 | |
| 
 | |
|     let struct_name = &ast.ident;
 | |
|     let (impl_generics, type_generics, where_clause) = &ast.generics.split_for_impl();
 | |
| 
 | |
|     TokenStream::from(quote! {
 | |
|         impl #impl_generics #bevy_ecs_path::event::Event for #struct_name #type_generics #where_clause {
 | |
|         }
 | |
|     })
 | |
| }
 | |
| 
 | |
| pub fn derive_resource(input: TokenStream) -> TokenStream {
 | |
|     let mut ast = parse_macro_input!(input as DeriveInput);
 | |
|     let bevy_ecs_path: Path = crate::bevy_ecs_path();
 | |
| 
 | |
|     ast.generics
 | |
|         .make_where_clause()
 | |
|         .predicates
 | |
|         .push(parse_quote! { Self: Send + Sync + 'static });
 | |
| 
 | |
|     let struct_name = &ast.ident;
 | |
|     let (impl_generics, type_generics, where_clause) = &ast.generics.split_for_impl();
 | |
| 
 | |
|     TokenStream::from(quote! {
 | |
|         impl #impl_generics #bevy_ecs_path::system::Resource for #struct_name #type_generics #where_clause {
 | |
|         }
 | |
|     })
 | |
| }
 | |
| 
 | |
| pub fn derive_component(input: TokenStream) -> TokenStream {
 | |
|     let mut ast = parse_macro_input!(input as DeriveInput);
 | |
|     let bevy_ecs_path: Path = crate::bevy_ecs_path();
 | |
| 
 | |
|     let attrs = match parse_component_attr(&ast) {
 | |
|         Ok(attrs) => attrs,
 | |
|         Err(e) => return e.into_compile_error().into(),
 | |
|     };
 | |
| 
 | |
|     let storage = storage_path(&bevy_ecs_path, attrs.storage);
 | |
| 
 | |
|     ast.generics
 | |
|         .make_where_clause()
 | |
|         .predicates
 | |
|         .push(parse_quote! { Self: Send + Sync + 'static });
 | |
| 
 | |
|     let struct_name = &ast.ident;
 | |
|     let (impl_generics, type_generics, where_clause) = &ast.generics.split_for_impl();
 | |
| 
 | |
|     TokenStream::from(quote! {
 | |
|         impl #impl_generics #bevy_ecs_path::component::Component for #struct_name #type_generics #where_clause {
 | |
|             const STORAGE_TYPE: #bevy_ecs_path::component::StorageType = #storage;
 | |
|         }
 | |
|     })
 | |
| }
 | |
| 
 | |
| pub const COMPONENT: &str = "component";
 | |
| pub const STORAGE: &str = "storage";
 | |
| 
 | |
| struct Attrs {
 | |
|     storage: StorageTy,
 | |
| }
 | |
| 
 | |
| #[derive(Clone, Copy)]
 | |
| enum StorageTy {
 | |
|     Table,
 | |
|     SparseSet,
 | |
| }
 | |
| 
 | |
| // values for `storage` attribute
 | |
| const TABLE: &str = "Table";
 | |
| const SPARSE_SET: &str = "SparseSet";
 | |
| 
 | |
| fn parse_component_attr(ast: &DeriveInput) -> Result<Attrs> {
 | |
|     let mut attrs = Attrs {
 | |
|         storage: StorageTy::Table,
 | |
|     };
 | |
| 
 | |
|     for meta in ast.attrs.iter().filter(|a| a.path().is_ident(COMPONENT)) {
 | |
|         meta.parse_nested_meta(|nested| {
 | |
|             if nested.path.is_ident(STORAGE) {
 | |
|                 attrs.storage = match nested.value()?.parse::<LitStr>()?.value() {
 | |
|                     s if s == TABLE => StorageTy::Table,
 | |
|                     s if s == SPARSE_SET => StorageTy::SparseSet,
 | |
|                     s => {
 | |
|                         return Err(nested.error(format!(
 | |
|                             "Invalid storage type `{s}`, expected '{TABLE}' or '{SPARSE_SET}'.",
 | |
|                         )));
 | |
|                     }
 | |
|                 };
 | |
|                 Ok(())
 | |
|             } else {
 | |
|                 Err(nested.error("Unsupported attribute"))
 | |
|             }
 | |
|         })?;
 | |
|     }
 | |
| 
 | |
|     Ok(attrs)
 | |
| }
 | |
| 
 | |
| fn storage_path(bevy_ecs_path: &Path, ty: StorageTy) -> TokenStream2 {
 | |
|     let storage_type = match ty {
 | |
|         StorageTy::Table => Ident::new("Table", Span::call_site()),
 | |
|         StorageTy::SparseSet => Ident::new("SparseSet", Span::call_site()),
 | |
|     };
 | |
| 
 | |
|     quote! { #bevy_ecs_path::component::StorageType::#storage_type }
 | |
| }
 |