Implement IntoProto<T> for Into<T>

Author: dlon

Cargo.lock

@@ -12,4 +12,5 @@ proc-macro = true
 [dependencies]
 proc-macro2 = "1"
 syn = { version= "2", features = ["extra-traits"] }
-quote = "1"
+quote = "1"
+chrono.workspace = true

mullvad-proc-macro/Cargo.toml

@@ -1,4 +1,6 @@
 #![allow(unused)]
+
+use chrono::DateTime;
 use mullvad_proc_macro::{IntoProto, UnwrapProto};
 
 #[derive(Debug)]
@@ -69,40 +71,55 @@ pub struct AppVersionInfo {
     pub suggested_upgrade: Option<String>,
 }
 
+#[derive(IntoProto, Debug)]
+pub struct Device {
+    pub created: chrono::DateTime<chrono::Utc>,
+}
+
+impl IntoProto<proto::Timestamp> for chrono::DateTime<chrono::Utc> {
+    fn into_proto(self) -> proto::Timestamp {
+        proto::Timestamp {
+            seconds: self.timestamp(),
+            nanos: 0,
+        }
+    }
+}
+
 pub type AppVersion = String;
 
 mod proto {
+    use mullvad_proc_macro::IntoProto;
+
     #[derive(Debug)]
     pub struct AppVersionInfo {
         pub supported: bool,
         pub latest_stable: String,
         pub latest_beta: String,
         pub suggested_upgrade: Option<String>,
     }
+
+    #[derive(Debug)]
+    pub struct Device {
+        pub created: Timestamp,
+    }
+
+    #[derive(Debug)]
+    pub struct Timestamp {
+        pub seconds: i64,
+        pub nanos: i32,
+    }
 }
 
 trait IntoProto<T> {
     fn into_proto(self) -> T;
 }
-impl<T: IntoProto<S>, S> IntoProto<Option<S>> for Option<T> {
-    fn into_proto(self) -> Option<S> {
-        self.map(|val| val.into_proto())
-    }
-}
 
-macro_rules! impl_into_proto_for_value_type {
-    ($ty:ty) => {
-        impl IntoProto<$ty> for $ty {
-            fn into_proto(self) -> $ty {
-                self
-            }
-        }
-    };
+impl<T: Into<S>, S> IntoProto<S> for T {
+    fn into_proto(self) -> S {
+        self.into()
+    }
 }
 
-impl_into_proto_for_value_type!(bool);
-impl_into_proto_for_value_type!(String);
-
 #[test]
 fn test_generate_into_proto() {
     let settings_proto = AppVersionInfo {
@@ -112,6 +129,13 @@ fn test_generate_into_proto() {
         supported: false,
     };
 
-    let settings = settings_proto.into_proto();
+    let settings: proto::AppVersionInfo = settings_proto.into_proto();
+    dbg!(settings);
+
+    let device_proto = Device {
+        created: DateTime::default(),
+    };
+
+    let settings: proto::Device = device_proto.into_proto();
     dbg!(settings);
 }