adapt to breaking changes in git-actor

Author: Byron

cargo-smart-release/src/utils.rs

@@ -300,7 +300,7 @@ mod tests {
 }
 
 pub fn time_to_offset_date_time(time: git::actor::Time) -> OffsetDateTime {
-    time::OffsetDateTime::from_unix_timestamp(time.time as i64)
+    time::OffsetDateTime::from_unix_timestamp(time.seconds_since_unix_epoch as i64)
         .expect("always valid unix time")
-        .replace_offset(time::UtcOffset::from_whole_seconds(time.offset).expect("valid offset"))
+        .replace_offset(time::UtcOffset::from_whole_seconds(time.offset_in_seconds).expect("valid offset"))
 }

git-object/src/commit/ref_iter.rs

@@ -58,12 +58,10 @@ impl<'a> CommitRefIter<'a> {
     /// if not exactly two signatures were iterable.
     /// Errors are not the common case - if an error needs to be detectable, use this instance as iterator.
     pub fn signatures(&'a mut self) -> impl Iterator<Item = git_actor::SignatureRef<'_>> + 'a {
-        self.filter_map(Result::ok)
-            .skip_while(|t| !matches!(t, Token::Author { .. } | Token::Committer { .. }))
-            .filter_map(|t| match t {
-                Token::Author { signature } | Token::Committer { signature } => Some(signature),
-                _ => None,
-            })
+        self.filter_map(|t| match t {
+            Ok(Token::Author { signature }) | Ok(Token::Committer { signature }) => Some(signature),
+            _ => None,
+        })
     }
 
     /// Returns the committer signature if there is no decoding error.

git-object/tests/immutable/commit/from_bytes.rs

@@ -139,8 +139,8 @@ fn with_trailer() -> crate::Result {
         name: "Kim Altintop".into(),
         email: "kim@eagain.st".into(),
         time: Time {
-            time: 1631514803,
-            offset: 7200,
+            seconds_since_unix_epoch: 1631514803,
+            offset_in_seconds: 7200,
             sign: Sign::Plus,
         },
     };

git-object/tests/immutable/commit/message.rs

@@ -236,8 +236,8 @@ mod summary {
             name: "name".into(),
             email: "email".into(),
             time: Time {
-                time: 0,
-                offset: 0,
+                seconds_since_unix_epoch: 0,
+                offset_in_seconds: 0,
                 sign: Sign::Plus,
             },
         };

git-object/tests/immutable/mod.rs

@@ -29,8 +29,8 @@ fn signature(time: u32) -> git_actor::SignatureRef<'static> {
         name: b"Sebastian Thiel".as_bstr(),
         email: b"sebastian.thiel@icloud.com".as_bstr(),
         time: Time {
-            time,
-            offset: 28800,
+            seconds_since_unix_epoch: time,
+            offset_in_seconds: 28800,
             sign: Sign::Plus,
         },
     }
@@ -42,8 +42,8 @@ fn linus_signature(time: u32) -> git_actor::SignatureRef<'static> {
         name: b"Linus Torvalds".as_bstr(),
         email: b"torvalds@linux-foundation.org".as_bstr(),
         time: Time {
-            time,
-            offset: -25200,
+            seconds_since_unix_epoch: time,
+            offset_in_seconds: -25200,
             sign: Sign::Minus,
         },
     }

git-object/tests/immutable/tag.rs

@@ -234,8 +234,8 @@ cjHJZXWmV4CcRfmLsXzU8s2cR9A0DBvOxhPD1TlKC2JhBFXigjuL9U4Rbq9tdegB
             name: b"Sebastian Thiel".as_bstr(),
             email: b"byronimo@gmail.com".as_bstr(),
             time: git_actor::Time {
-                time: 1528473343,
-                offset,
+                seconds_since_unix_epoch: 1528473343,
+                offset_in_seconds: offset,
                 sign: git_actor::Sign::Plus,
             },
         }),

git-odb/tests/odb/store/loose.rs

@@ -288,8 +288,8 @@ fn signature(time: u32) -> git_actor::SignatureRef<'static> {
         name: b"Sebastian Thiel".as_bstr(),
         email: b"byronimo@gmail.com".as_bstr(),
         time: Time {
-            time,
-            offset: 7200,
+            seconds_since_unix_epoch: time,
+            offset_in_seconds: 7200,
             sign: Sign::Plus,
         },
     }

git-ref/src/store/file/log/line.rs

@@ -229,8 +229,8 @@ pub mod decode {
                             name: b"name".as_bstr(),
                             email: b"foo@example.com".as_bstr(),
                             time: Time {
-                                time: 1234567890,
-                                offset: 0,
+                                seconds_since_unix_epoch: 1234567890,
+                                offset_in_seconds: 0,
                                 sign: Sign::Minus
                             }
                         },
@@ -255,8 +255,8 @@ pub mod decode {
                         name: b"Sebastian Thiel".as_bstr(),
                         email: b"foo@example.com".as_bstr(),
                         time: Time {
-                            time: 1618030561,
-                            offset: 28800,
+                            seconds_since_unix_epoch: 1618030561,
+                            offset_in_seconds: 28800,
                             sign: Sign::Plus,
                         },
                     },

git-ref/src/store/file/loose/reflog/create_or_update/tests.rs

@@ -73,8 +73,8 @@ fn missing_reflog_creates_it_even_if_similarly_named_empty_dir_exists_and_append
             name: "committer".into(),
             email: "commiter@example.com".into(),
             time: Time {
-                time: 1234,
-                offset: 1800,
+                seconds_since_unix_epoch: 1234,
+                offset_in_seconds: 1800,
                 sign: Sign::Plus,
             },
         };

git-ref/tests/file/transaction/mod.rs

@@ -25,8 +25,8 @@ mod prepare_and_commit {
             name: "committer".into(),
             email: "committer@example.com".into(),
             time: Time {
-                time: 1234,
-                offset: 1800,
+                seconds_since_unix_epoch: 1234,
+                offset_in_seconds: 1800,
                 sign: Sign::Plus,
             },
         }