Fix TryInto derive for generics

JelteF · Jul 4, 2024 · 90c1d8d · 90c1d8d
1 parent a429e7f
commit 90c1d8d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/impl/src/try_into.rs b/impl/src/try_into.rs
@@ -104,7 +104,7 @@ pub fn expand(input: &DeriveInput, trait_name: &'static str) -> Result<TokenStre
  impl #impl_generics derive_more::core::convert::TryFrom<
  #reference_with_lifetime #input_type #ty_generics
  > for (#(#reference_with_lifetime #original_types),*) #where_clause {
- type Error = derive_more::TryIntoError<#reference_with_lifetime #input_type>;
+ type Error = derive_more::TryIntoError<#reference_with_lifetime #input_type #ty_generics>;
 
  #[inline]
  fn try_from(

diff --git a/tests/generics.rs b/tests/generics.rs
@@ -3,7 +3,7 @@
 
 use derive_more::{
  Add, AddAssign, Constructor, Deref, DerefMut, Display, Error, From, FromStr, Index,
- IndexMut, IntoIterator, Mul, MulAssign, Not, Sum,
+ IndexMut, IntoIterator, Mul, MulAssign, Not, Sum, TryInto
 };
 
 #[derive(
@@ -262,3 +262,12 @@ struct StructLifetimeGenericBoundsConstDefault<
 > {
  inner: &'lt E,
 }
+
+
+#[derive(Debug, Display)]
+struct Wrapper<'a, const Y: usize, U>(&'a [U; Y]);
+
+#[derive(Debug, Display, TryInto)]
+enum Foo<'lt: 'static, T: Clone, const X: usize> {
+ X(Wrapper<'lt, X, T>),
+}
diff --git a/tests/try_into.rs b/tests/try_into.rs
@@ -40,6 +40,13 @@ enum MixedInts {
  Unit2,
 }
 
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+struct Wrapper<'a, const Y: usize, U>(&'a [U; Y]);
+
+enum Foo<'lt: 'static, T: Clone, const X: usize> {
+ X(Wrapper<'lt, X, T>),
+}
+
 #[test]
 fn test_try_into() {
  let mut i = MixedInts::SmallInt(42);