diff --git a/dynosaur/tests/pass/basic-mut.stdout b/dynosaur/tests/pass/basic-mut.stdout index e0c10c3..bb9bcac 100644 --- a/dynosaur/tests/pass/basic-mut.stdout +++ b/dynosaur/tests/pass/basic-mut.stdout @@ -8,7 +8,7 @@ use dynosaur::dynosaur; trait MyTrait { async fn foo(&mut self); } -mod _dynosaur_macro_DynMyTrait { +mod _dynosaur_macro_dynmytrait { use super::*; trait ErasedMyTrait { fn foo<'life0, 'dynosaur>(&'life0 mut self) @@ -65,6 +65,6 @@ mod _dynosaur_macro_DynMyTrait { } } } -use _dynosaur_macro_DynMyTrait::DynMyTrait; +use _dynosaur_macro_dynmytrait::DynMyTrait; fn main() {} diff --git a/dynosaur/tests/pass/basic-no-ret.stdout b/dynosaur/tests/pass/basic-no-ret.stdout index 7ef5b74..099fd07 100644 --- a/dynosaur/tests/pass/basic-no-ret.stdout +++ b/dynosaur/tests/pass/basic-no-ret.stdout @@ -8,7 +8,7 @@ use dynosaur::dynosaur; trait MyTrait { async fn foo(&self); } -mod _dynosaur_macro_DynMyTrait { +mod _dynosaur_macro_dynmytrait { use super::*; trait ErasedMyTrait { fn foo<'life0, 'dynosaur>(&'life0 self) @@ -65,6 +65,6 @@ mod _dynosaur_macro_DynMyTrait { } } } -use _dynosaur_macro_DynMyTrait::DynMyTrait; +use _dynosaur_macro_dynmytrait::DynMyTrait; fn main() {} diff --git a/dynosaur/tests/pass/basic-rpitit.stdout b/dynosaur/tests/pass/basic-rpitit.stdout index d7ae908..b0b046c 100644 --- a/dynosaur/tests/pass/basic-rpitit.stdout +++ b/dynosaur/tests/pass/basic-rpitit.stdout @@ -9,7 +9,7 @@ trait MyTrait { fn foo(&self) -> impl Send; } -mod _dynosaur_macro_DynMyTrait { +mod _dynosaur_macro_dynmytrait { use super::*; trait ErasedMyTrait { fn foo<'life0, 'dynosaur>(&'life0 self) @@ -60,6 +60,6 @@ mod _dynosaur_macro_DynMyTrait { } } } -use _dynosaur_macro_DynMyTrait::DynMyTrait; +use _dynosaur_macro_dynmytrait::DynMyTrait; fn main() {} diff --git a/dynosaur/tests/pass/basic-with-self.stdout b/dynosaur/tests/pass/basic-with-self.stdout index c505235..6ef980c 100644 --- a/dynosaur/tests/pass/basic-with-self.stdout +++ b/dynosaur/tests/pass/basic-with-self.stdout @@ -10,7 +10,7 @@ trait MyTrait { async fn foo(&self) -> Self::Item; } -mod _dynosaur_macro_DynMyTrait { +mod _dynosaur_macro_dynmytrait { use super::*; trait ErasedMyTrait { type Item; @@ -79,6 +79,6 @@ mod _dynosaur_macro_DynMyTrait { } } } -use _dynosaur_macro_DynMyTrait::DynMyTrait; +use _dynosaur_macro_dynmytrait::DynMyTrait; fn main() {} diff --git a/dynosaur/tests/pass/basic.stdout b/dynosaur/tests/pass/basic.stdout index 4b50fd2..c8ed957 100644 --- a/dynosaur/tests/pass/basic.stdout +++ b/dynosaur/tests/pass/basic.stdout @@ -9,7 +9,7 @@ trait MyTrait { async fn foo(&self) -> i32; } -mod _dynosaur_macro_DynMyTrait { +mod _dynosaur_macro_dynmytrait { use super::*; trait ErasedMyTrait { fn foo<'life0, 'dynosaur>(&'life0 self) @@ -66,6 +66,6 @@ mod _dynosaur_macro_DynMyTrait { } } } -use _dynosaur_macro_DynMyTrait::DynMyTrait; +use _dynosaur_macro_dynmytrait::DynMyTrait; fn main() {} diff --git a/dynosaur/tests/pass/handle-generics-on-trait-def.stdout b/dynosaur/tests/pass/handle-generics-on-trait-def.stdout index dbb7e64..6eb4f55 100644 --- a/dynosaur/tests/pass/handle-generics-on-trait-def.stdout +++ b/dynosaur/tests/pass/handle-generics-on-trait-def.stdout @@ -11,7 +11,7 @@ trait MyTrait { async fn foo(&self, x: &T) -> i32; } -mod _dynosaur_macro_DynMyTrait { +mod _dynosaur_macro_dynmytrait { use super::*; trait ErasedMyTrait { const N: i32; @@ -85,6 +85,6 @@ mod _dynosaur_macro_DynMyTrait { } } } -use _dynosaur_macro_DynMyTrait::DynMyTrait; +use _dynosaur_macro_dynmytrait::DynMyTrait; fn main() {} diff --git a/dynosaur/tests/pass/handle-lifetimes.stdout b/dynosaur/tests/pass/handle-lifetimes.stdout index c2aaa29..fe2ffae 100644 --- a/dynosaur/tests/pass/handle-lifetimes.stdout +++ b/dynosaur/tests/pass/handle-lifetimes.stdout @@ -10,7 +10,7 @@ trait MyTrait { async fn foo(&self, x: &T) -> i32; } -mod _dynosaur_macro_DynMyTrait { +mod _dynosaur_macro_dynmytrait { use super::*; trait ErasedMyTrait { type Item; @@ -80,6 +80,6 @@ mod _dynosaur_macro_DynMyTrait { } } } -use _dynosaur_macro_DynMyTrait::DynMyTrait; +use _dynosaur_macro_dynmytrait::DynMyTrait; fn main() {} diff --git a/dynosaur/tests/pass/trait-variant.stdout b/dynosaur/tests/pass/trait-variant.stdout index ee891a9..f149ff2 100644 --- a/dynosaur/tests/pass/trait-variant.stdout +++ b/dynosaur/tests/pass/trait-variant.stdout @@ -9,7 +9,7 @@ trait Next { async fn next(&mut self) -> Option; } -mod _dynosaur_macro_DynNext { +mod _dynosaur_macro_dynnext { use super::*; #[allow(async_fn_in_trait)] trait ErasedNext { @@ -76,13 +76,13 @@ mod _dynosaur_macro_DynNext { } } } -use _dynosaur_macro_DynNext::DynNext; +use _dynosaur_macro_dynnext::DynNext; trait SendNext: Send { type Item; fn next(&mut self) -> impl ::core::future::Future> + Send; } -mod _dynosaur_macro_DynSendNext { +mod _dynosaur_macro_dynsendnext { use super::*; trait ErasedSendNext: Send { type Item; @@ -154,7 +154,7 @@ mod _dynosaur_macro_DynSendNext { } } } -use _dynosaur_macro_DynSendNext::DynSendNext; +use _dynosaur_macro_dynsendnext::DynSendNext; impl Next for TraitVariantBlanketType { type Item = ::Item; async fn next(&mut self) -> Option { diff --git a/dynosaur_derive/src/lib.rs b/dynosaur_derive/src/lib.rs index 93ed850..e4a5384 100644 --- a/dynosaur_derive/src/lib.rs +++ b/dynosaur_derive/src/lib.rs @@ -157,7 +157,10 @@ pub fn dynosaur( let struct_inherent_impl = mk_struct_inherent_impl(&struct_ident, &item_trait.ident, &erased_trait); let dynosaur_mod = Ident::new( - &format!("_dynosaur_macro_{}", struct_ident), + &format!( + "_dynosaur_macro_{}", + struct_ident.to_string().to_lowercase(), + ), Span::call_site(), );