From: Matt Corallo <git@bluematt.me>
Date: Thu, 29 Apr 2021 15:21:04 +0000 (+0000)
Subject: Handle std::time::SystemTime as a manually-converted object
X-Git-Tag: v0.0.98~10^2~2
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=95fa736720b362322b7b6a010b4c3f517c11e701;p=ldk-c-bindings

Handle std::time::SystemTime as a manually-converted object
---

diff --git a/c-bindings-gen/src/types.rs b/c-bindings-gen/src/types.rs
index 96ec894..a45cf2b 100644
--- a/c-bindings-gen/src/types.rs
+++ b/c-bindings-gen/src/types.rs
@@ -812,6 +812,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 			"String" if is_ref => Some("crate::c_types::Str"),
 
 			"std::time::Duration" => Some("u64"),
+			"std::time::SystemTime" => Some("u64"),
 			"std::io::Error" => Some("crate::c_types::IOError"),
 
 			"bech32::u5" => Some("crate::c_types::u5"),
@@ -884,6 +885,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 			// cannot create a &String.
 
 			"std::time::Duration" => Some("std::time::Duration::from_secs("),
+			"std::time::SystemTime" => Some("(::std::time::SystemTime::UNIX_EPOCH + std::time::Duration::from_secs("),
 
 			"bech32::u5" => Some(""),
 
@@ -946,6 +948,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 			"String" if !is_ref => Some(".into_rust()).unwrap()"),
 
 			"std::time::Duration" => Some(")"),
+			"std::time::SystemTime" => Some("))"),
 
 			"bech32::u5" => Some(".into()"),
 
@@ -1023,6 +1026,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 			"String" => Some(""),
 
 			"std::time::Duration" => Some(""),
+			"std::time::SystemTime" => Some(""),
 			"std::io::Error" if !is_ref => Some("crate::c_types::IOError::from_rust("),
 
 			"bech32::u5" => Some(""),
@@ -1091,6 +1095,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
 			"String" if is_ref => Some(".as_str().into()"),
 
 			"std::time::Duration" => Some(".as_secs()"),
+			"std::time::SystemTime" => Some(".duration_since(::std::time::SystemTime::UNIX_EPOCH).expect(\"Times must be post-1970\").as_secs()"),
 			"std::io::Error" if !is_ref => Some(")"),
 
 			"bech32::u5" => Some(".into()"),