 992681b59b
			
		
	
	
		992681b59b
		
	
	
	
	
		
			
			*This PR description is an edited copy of #5007, written by @alice-i-cecile.* # Objective Follow-up to https://github.com/bevyengine/bevy/pull/2254. The `Resource` trait currently has a blanket implementation for all types that meet its bounds. While ergonomic, this results in several drawbacks: * it is possible to make confusing, silent mistakes such as inserting a function pointer (Foo) rather than a value (Foo::Bar) as a resource * it is challenging to discover if a type is intended to be used as a resource * we cannot later add customization options (see the [RFC](https://github.com/bevyengine/rfcs/blob/main/rfcs/27-derive-component.md) for the equivalent choice for Component). * dependencies can use the same Rust type as a resource in invisibly conflicting ways * raw Rust types used as resources cannot preserve privacy appropriately, as anyone able to access that type can read and write to internal values * we cannot capture a definitive list of possible resources to display to users in an editor ## Notes to reviewers * Review this commit-by-commit; there's effectively no back-tracking and there's a lot of churn in some of these commits. *ira: My commits are not as well organized :')* * I've relaxed the bound on Local to Send + Sync + 'static: I don't think these concerns apply there, so this can keep things simple. Storing e.g. a u32 in a Local is fine, because there's a variable name attached explaining what it does. * I think this is a bad place for the Resource trait to live, but I've left it in place to make reviewing easier. IMO that's best tackled with https://github.com/bevyengine/bevy/issues/4981. ## Changelog `Resource` is no longer automatically implemented for all matching types. Instead, use the new `#[derive(Resource)]` macro. ## Migration Guide Add `#[derive(Resource)]` to all types you are using as a resource. If you are using a third party type as a resource, wrap it in a tuple struct to bypass orphan rules. Consider deriving `Deref` and `DerefMut` to improve ergonomics. `ClearColor` no longer implements `Component`. Using `ClearColor` as a component in 0.8 did nothing. Use the `ClearColorConfig` in the `Camera3d` and `Camera2d` components instead. Co-authored-by: Alice <alice.i.cecile@gmail.com> Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com> Co-authored-by: devil-ira <justthecooldude@gmail.com> Co-authored-by: Carter Anderson <mcanders1@gmail.com>
		
			
				
	
	
		
			125 lines
		
	
	
		
			3.8 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
			
		
		
	
	
			125 lines
		
	
	
		
			3.8 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
| use bevy_macro_utils::{get_lit_str, Symbol};
 | |
| use proc_macro::TokenStream;
 | |
| use proc_macro2::{Span, TokenStream as TokenStream2};
 | |
| use quote::{quote, ToTokens};
 | |
| use syn::{parse_macro_input, parse_quote, DeriveInput, Error, Ident, Path, Result};
 | |
| 
 | |
| 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 {
 | |
|             type Storage = #storage;
 | |
|         }
 | |
|     })
 | |
| }
 | |
| 
 | |
| pub const COMPONENT: Symbol = Symbol("component");
 | |
| pub const STORAGE: Symbol = Symbol("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 meta_items = bevy_macro_utils::parse_attrs(ast, COMPONENT)?;
 | |
| 
 | |
|     let mut attrs = Attrs {
 | |
|         storage: StorageTy::Table,
 | |
|     };
 | |
| 
 | |
|     for meta in meta_items {
 | |
|         use syn::{
 | |
|             Meta::NameValue,
 | |
|             NestedMeta::{Lit, Meta},
 | |
|         };
 | |
|         match meta {
 | |
|             Meta(NameValue(m)) if m.path == STORAGE => {
 | |
|                 attrs.storage = match get_lit_str(STORAGE, &m.lit)?.value().as_str() {
 | |
|                     TABLE => StorageTy::Table,
 | |
|                     SPARSE_SET => StorageTy::SparseSet,
 | |
|                     s => {
 | |
|                         return Err(Error::new_spanned(
 | |
|                             m.lit,
 | |
|                             format!(
 | |
|                                 "Invalid storage type `{}`, expected '{}' or '{}'.",
 | |
|                                 s, TABLE, SPARSE_SET
 | |
|                             ),
 | |
|                         ))
 | |
|                     }
 | |
|                 };
 | |
|             }
 | |
|             Meta(meta_item) => {
 | |
|                 return Err(Error::new_spanned(
 | |
|                     meta_item.path(),
 | |
|                     format!(
 | |
|                         "unknown component attribute `{}`",
 | |
|                         meta_item.path().into_token_stream()
 | |
|                     ),
 | |
|                 ));
 | |
|             }
 | |
|             Lit(lit) => {
 | |
|                 return Err(Error::new_spanned(
 | |
|                     lit,
 | |
|                     "unexpected literal in component attribute",
 | |
|                 ))
 | |
|             }
 | |
|         }
 | |
|     }
 | |
| 
 | |
|     Ok(attrs)
 | |
| }
 | |
| 
 | |
| fn storage_path(bevy_ecs_path: &Path, ty: StorageTy) -> TokenStream2 {
 | |
|     let typename = match ty {
 | |
|         StorageTy::Table => Ident::new("TableStorage", Span::call_site()),
 | |
|         StorageTy::SparseSet => Ident::new("SparseStorage", Span::call_site()),
 | |
|     };
 | |
| 
 | |
|     quote! { #bevy_ecs_path::component::#typename }
 | |
| }
 |