This commit is contained in:
Nova
2024-09-14 20:24:55 -04:00
parent 7f78f6f1a8
commit f330492a01
3 changed files with 9 additions and 9 deletions

View File

@@ -196,6 +196,7 @@ fn generate_aspect(aspect: &Aspect) -> TokenStream {
.map(|t| { .map(|t| {
// TODO: properly import all dependencies // TODO: properly import all dependencies
quote! { quote! {
#[allow(clippy::all)]
pub mod #client_mod_name { pub mod #client_mod_name {
use super::*; use super::*;
#t #t
@@ -252,12 +253,12 @@ fn generate_aspect(aspect: &Aspect) -> TokenStream {
.reduce(fold_tokens) .reduce(fold_tokens)
.unwrap_or_default(); .unwrap_or_default();
let server_side_members = quote! { let server_side_members = quote! {
#[allow(clippy::all)]
#[doc = #description] #[doc = #description]
pub trait #aspect_trait_name { pub trait #aspect_trait_name {
#server_side_members #server_side_members
} }
}; };
let aspect_name = aspect.name.to_case(Case::Camel);
let aspect_macro_name = Ident::new( let aspect_macro_name = Ident::new(
&format!( &format!(
"impl_aspect_for_{}_aspect", "impl_aspect_for_{}_aspect",
@@ -269,15 +270,13 @@ fn generate_aspect(aspect: &Aspect) -> TokenStream {
let aspect_macro = quote! { let aspect_macro = quote! {
macro_rules! #aspect_macro_name { macro_rules! #aspect_macro_name {
() => { () => {
fn name(&self) -> String {
#aspect_name.to_string()
}
fn id(&self) -> u64 { fn id(&self) -> u64 {
#aspect_id #aspect_id
} }
fn as_any(self: Arc<Self>) -> Arc<dyn std::any::Any + Send + Sync + 'static> { fn as_any(self: Arc<Self>) -> Arc<dyn std::any::Any + Send + Sync + 'static> {
self self
} }
#[allow(clippy::all)]
fn run_signal( fn run_signal(
&self, &self,
_calling_client: std::sync::Arc<crate::core::client::Client>, _calling_client: std::sync::Arc<crate::core::client::Client>,
@@ -290,6 +289,7 @@ fn generate_aspect(aspect: &Aspect) -> TokenStream {
_ => Err(stardust_xr::scenegraph::ScenegraphError::SignalNotFound) _ => Err(stardust_xr::scenegraph::ScenegraphError::SignalNotFound)
} }
} }
#[allow(clippy::all)]
fn run_method( fn run_method(
&self, &self,
_calling_client: std::sync::Arc<crate::core::client::Client>, _calling_client: std::sync::Arc<crate::core::client::Client>,
@@ -348,6 +348,7 @@ fn generate_alias_info(aspect: &Aspect) -> TokenStream {
quote! { quote! {
lazy_static::lazy_static! { lazy_static::lazy_static! {
#[allow(clippy::all)]
pub static ref #aspect_alias_info_name: crate::nodes::alias::AliasInfo = crate::nodes::alias::AliasInfo { pub static ref #aspect_alias_info_name: crate::nodes::alias::AliasInfo = crate::nodes::alias::AliasInfo {
server_signals: vec![#local_signals], server_signals: vec![#local_signals],
server_methods: vec![#local_methods], server_methods: vec![#local_methods],
@@ -444,7 +445,10 @@ fn generate_run_member(aspect_name: &Ident, _type: MemberType, member: &Member)
.clone() .clone()
.zip(argument_types) .zip(argument_types)
.map(|(argument_names, argument_types)| { .map(|(argument_names, argument_types)| {
quote!(let (#argument_names): (#argument_types) = stardust_xr::schemas::flex::deserialize(_message.as_ref())?;) quote!{
#[allow(unused_parens)]
let (#argument_names): (#argument_types) = stardust_xr::schemas::flex::deserialize(_message.as_ref())?;
}
}) })
.unwrap_or_default(); .unwrap_or_default();
let serialize = generate_argument_serialize( let serialize = generate_argument_serialize(

View File

@@ -69,9 +69,6 @@ impl Alias {
} }
} }
impl Aspect for Alias { impl Aspect for Alias {
fn name(&self) -> String {
"Alias".to_string()
}
fn id(&self) -> u64 { fn id(&self) -> u64 {
0 0
} }

View File

@@ -299,7 +299,6 @@ impl Drop for Node {
} }
pub trait Aspect: Any + Send + Sync + 'static { pub trait Aspect: Any + Send + Sync + 'static {
fn name(&self) -> String;
fn id(&self) -> u64; fn id(&self) -> u64;
fn as_any(self: Arc<Self>) -> Arc<dyn Any + Send + Sync + 'static>; fn as_any(self: Arc<Self>) -> Arc<dyn Any + Send + Sync + 'static>;
fn run_signal( fn run_signal(