Merge pull request #7 from alexkazik/tuple

Tuple
alexkazik · Sep 20, 2023 · 0fdeee7 · 0fdeee7
2 parents e53d223 + 320424f
commit 0fdeee7
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ownable/Cargo.toml b/ownable/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ownable"
-version = "0.6.0"
+version = "0.6.1"
 authors = ["ALeX Kazik <alex@kazik.de>"]
 edition = "2021"
 description = "Derive macro for structs/enums with Cow, which can convert Type<'a> to Type<'static> and more"

diff --git a/ownable/ChangeLog.md b/ownable/ChangeLog.md
@@ -1,5 +1,9 @@
 # Changelog for ownable
 
+## 0.6.1 -- 2023-09-20
+
+* Support tuples
+
 ## 0.6.0 -- 2023-05-06
 
 * Support to not generate functions

diff --git a/ownable/src/traits/mod.rs b/ownable/src/traits/mod.rs
@@ -209,3 +209,55 @@ where
             .collect()
     }
 }
+
+// Tuples
+
+macro_rules! tuple_impls {
+    ($($(#[$attrs:meta])?($($n:tt $name:ident)+),)+) => {
+        $(
+            impl<'a, $($name: ToBorrowed<'a>),+> ToBorrowed<'a> for ($($name,)+) {
+                $(#[$attrs])?
+                fn to_borrowed(&'a self) -> Self {
+                    ($(self.$n.to_borrowed(),)+)
+                }
+            }
+
+            impl<$($name: ToOwned),+> ToOwned for ($($name,)+) {
+                type Owned = ($($name::Owned,)+);
+
+                $(#[$attrs])?
+                fn to_owned(&self) -> Self::Owned where {
+                    ($(self.$n.to_owned(),)+)
+                }
+            }
+
+            impl<$($name: IntoOwned),+> IntoOwned for ($($name,)+) {
+                type Owned = ($($name::Owned,)+);
+
+                $(#[$attrs])?
+                fn into_owned(self) -> Self::Owned {
+                    ($(IntoOwned::into_owned(self.$n),)+)
+                }
+            }
+        )+
+    };
+}
+
+tuple_impls! {
+    #[inline(always)] (0 T0),
+    #[inline] (0 T0 1 T1),
+    #[inline] (0 T0 1 T1 2 T2),
+    (0 T0 1 T1 2 T2 3 T3),
+    (0 T0 1 T1 2 T2 3 T3 4 T4),
+    (0 T0 1 T1 2 T2 3 T3 4 T4 5 T5),
+    (0 T0 1 T1 2 T2 3 T3 4 T4 5 T5 6 T6),
+    (0 T0 1 T1 2 T2 3 T3 4 T4 5 T5 6 T6 7 T7),
+    (0 T0 1 T1 2 T2 3 T3 4 T4 5 T5 6 T6 7 T7 8 T8),
+    (0 T0 1 T1 2 T2 3 T3 4 T4 5 T5 6 T6 7 T7 8 T8 9 T9),
+    (0 T0 1 T1 2 T2 3 T3 4 T4 5 T5 6 T6 7 T7 8 T8 9 T9 10 T10),
+    (0 T0 1 T1 2 T2 3 T3 4 T4 5 T5 6 T6 7 T7 8 T8 9 T9 10 T10 11 T11),
+    (0 T0 1 T1 2 T2 3 T3 4 T4 5 T5 6 T6 7 T7 8 T8 9 T9 10 T10 11 T11 12 T12),
+    (0 T0 1 T1 2 T2 3 T3 4 T4 5 T5 6 T6 7 T7 8 T8 9 T9 10 T10 11 T11 12 T12 13 T13),
+    (0 T0 1 T1 2 T2 3 T3 4 T4 5 T5 6 T6 7 T7 8 T8 9 T9 10 T10 11 T11 12 T12 13 T13 14 T14),
+    (0 T0 1 T1 2 T2 3 T3 4 T4 5 T5 6 T6 7 T7 8 T8 9 T9 10 T10 11 T11 12 T12 13 T13 14 T14 15 T15),
+}
diff --git a/ownable/tests/basic.rs b/ownable/tests/basic.rs
@@ -11,6 +11,7 @@ struct Test<'a> {
     copy: usize,
     as_copy: AsCopy<Ipv4Addr>,
     as_clone: AsClone<String>,
+    tuple: (Cow<'a, str>, u64),
 }
 
 #[test]
@@ -23,6 +24,7 @@ fn test() {
         copy: 0,
         as_copy: AsCopy(Ipv4Addr::LOCALHOST),
         as_clone: AsClone("as_clone".to_string()),
+        tuple: (Cow::Borrowed(&value), 64),
     };
     let v1: Test<'_> = v0.to_borrowed();
     assert_eq!(v0, v1);