From f3338ef9f7782c73ebb932060329e9c188032dc8 Mon Sep 17 00:00:00 2001 From: benluelo Date: Mon, 14 Nov 2022 16:30:27 -0500 Subject: [PATCH 1/2] Change NonZero* TypeInfo not recursive --- src/impls.rs | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/impls.rs b/src/impls.rs index 27efbb20..080f065a 100644 --- a/src/impls.rs +++ b/src/impls.rs @@ -133,14 +133,14 @@ impl_metadata_for_tuple!(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S impl_metadata_for_tuple!(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T); macro_rules! impl_for_non_zero { - ( $( $t: ty ),* $(,)? ) => { + ( $( $t: ty: $inner: ty ),* $(,)? ) => { $( impl TypeInfo for $t { type Identity = Self; fn type_info() -> Type { Type::builder() .path(Path::prelude(stringify!($t))) - .composite(Fields::unnamed().field(|f| f.ty::<$t>())) + .composite(Fields::unnamed().field(|f| f.ty::<$inner>())) } } )* @@ -148,16 +148,16 @@ macro_rules! impl_for_non_zero { } impl_for_non_zero!( - NonZeroI8, - NonZeroI16, - NonZeroI32, - NonZeroI64, - NonZeroI128, - NonZeroU8, - NonZeroU16, - NonZeroU32, - NonZeroU64, - NonZeroU128 + NonZeroI8: i8, + NonZeroI16: i16, + NonZeroI32: i32, + NonZeroI64: i64, + NonZeroI128: i128, + NonZeroU8: u8, + NonZeroU16: u16, + NonZeroU32: u32, + NonZeroU64: u64, + NonZeroU128: u128 ); impl TypeInfo for Vec From 675c76e736dc3ca16ec511336273f483ee1c1fd7 Mon Sep 17 00:00:00 2001 From: benluelo Date: Mon, 14 Nov 2022 18:23:38 -0500 Subject: [PATCH 2/2] Fix test --- src/tests.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests.rs b/src/tests.rs index 753ada1f..735bc913 100644 --- a/src/tests.rs +++ b/src/tests.rs @@ -101,7 +101,7 @@ fn prelude_items() { NonZeroU32, Type::builder() .path(Path::prelude("NonZeroU32")) - .composite(Fields::unnamed().field(|f| f.ty::())) + .composite(Fields::unnamed().field(|f| f.ty::())) ) }