change!: Time::time -> Time::seconds_since_unix_epoch (#301)

And `Time::offset` to `Time::offset_in_seconds`.

Author: Byron

git-actor/src/lib.rs

@@ -56,10 +56,10 @@ pub enum Sign {
 #[derive(PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone, Copy)]
 #[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))]
 pub struct Time {
-    /// time in seconds from epoch.
-    pub time: u32,
+    /// time in seconds since epoch.
+    pub seconds_since_unix_epoch: u32,
     /// time offset in seconds, may be negative to match the `sign` field.
-    pub offset: i32,
+    pub offset_in_seconds: i32,
     /// the sign of `offset`, used to encode `-0000` which would otherwise loose sign information.
     pub sign: Sign,
 }

git-actor/src/signature/decode.rs

@@ -56,7 +56,11 @@ pub fn decode<'a, E: ParseError<&'a [u8]> + ContextError<&'a [u8]>>(
         SignatureRef {
             name: name.as_bstr(),
             email: email.as_bstr(),
-            time: Time { time, offset, sign },
+            time: Time {
+                seconds_since_unix_epoch: time,
+                offset_in_seconds: offset,
+                sign,
+            },
         },
     ))
 }
@@ -84,7 +88,11 @@ mod tests {
             SignatureRef {
                 name: name.as_bytes().as_bstr(),
                 email: email.as_bytes().as_bstr(),
-                time: Time { time, offset, sign },
+                time: Time {
+                    seconds_since_unix_epoch: time,
+                    offset_in_seconds: offset,
+                    sign,
+                },
             }
         }
 

git-actor/src/signature/mod.rs

@@ -37,8 +37,8 @@ mod convert {
                 name: Default::default(),
                 email: Default::default(),
                 time: Time {
-                    time: 0,
-                    offset: 0,
+                    seconds_since_unix_epoch: 0,
+                    offset_in_seconds: 0,
                     sign: Sign::Plus,
                 },
             }
@@ -145,11 +145,11 @@ mod init {
                 name: name.into(),
                 email: email.into(),
                 time: Time {
-                    time: std::time::SystemTime::now()
+                    seconds_since_unix_epoch: std::time::SystemTime::now()
                         .duration_since(std::time::UNIX_EPOCH)
                         .expect("the system time doesn't run backwards that much")
                         .as_secs() as u32,
-                    offset,
+                    offset_in_seconds: offset,
                     sign: offset.into(),
                 },
             })
@@ -164,11 +164,11 @@ mod init {
                 name: name.into(),
                 email: email.into(),
                 time: Time {
-                    time: std::time::SystemTime::now()
+                    seconds_since_unix_epoch: std::time::SystemTime::now()
                         .duration_since(std::time::UNIX_EPOCH)
                         .expect("the system time doesn't run backwards that much")
                         .as_secs() as u32,
-                    offset,
+                    offset_in_seconds: offset,
                     sign: offset.into(),
                 },
             }
@@ -183,8 +183,8 @@ mod init {
                 name: name.into(),
                 email: email.into(),
                 time: Time {
-                    time: seconds_since_epoch(),
-                    offset: utc_offset,
+                    seconds_since_unix_epoch: seconds_since_epoch(),
+                    offset_in_seconds: utc_offset,
                     sign: utc_offset.into(),
                 },
             }

git-actor/src/time.rs

@@ -16,7 +16,7 @@ impl Time {
     /// Serialize this instance to `out` in a format suitable for use in header fields of serialized git commits or tags.
     pub fn write_to(&self, mut out: impl io::Write) -> io::Result<()> {
         let mut itoa = itoa::Buffer::new();
-        out.write_all(itoa.format(self.time).as_bytes())?;
+        out.write_all(itoa.format(self.seconds_since_unix_epoch).as_bytes())?;
         out.write_all(SPACE)?;
         out.write_all(match self.sign {
             Sign::Plus => b"+",
@@ -26,7 +26,7 @@ impl Time {
         const ZERO: &[u8; 1] = b"0";
 
         const SECONDS_PER_HOUR: i32 = 60 * 60;
-        let offset = self.offset.abs();
+        let offset = self.offset_in_seconds.abs();
         let hours = offset / SECONDS_PER_HOUR;
         assert!(hours < 25, "offset is more than a day: {}", hours);
         let minutes = (offset - (hours * SECONDS_PER_HOUR)) / 60;
@@ -45,23 +45,23 @@ impl Time {
     pub fn size(&self) -> usize {
         // TODO: this is not year 2038 safe…but we also can't parse larger numbers (or represent them) anyway. It's a trap nonetheless
         //       that can be fixed by increasing the size to usize.
-        (if self.time >= 1_000_000_000 {
+        (if self.seconds_since_unix_epoch >= 1_000_000_000 {
             10
-        } else if self.time >= 100_000_000 {
+        } else if self.seconds_since_unix_epoch >= 100_000_000 {
             9
-        } else if self.time >= 10_000_000 {
+        } else if self.seconds_since_unix_epoch >= 10_000_000 {
             8
-        } else if self.time >= 1_000_000 {
+        } else if self.seconds_since_unix_epoch >= 1_000_000 {
             7
-        } else if self.time >= 100_000 {
+        } else if self.seconds_since_unix_epoch >= 100_000 {
             6
-        } else if self.time >= 10_000 {
+        } else if self.seconds_since_unix_epoch >= 10_000 {
             5
-        } else if self.time >= 1_000 {
+        } else if self.seconds_since_unix_epoch >= 1_000 {
             4
-        } else if self.time >= 100 {
+        } else if self.seconds_since_unix_epoch >= 100 {
             3
-        } else if self.time >= 10 {
+        } else if self.seconds_since_unix_epoch >= 10 {
             2
         } else {
             1

git-actor/tests/signature/mod.rs

@@ -43,8 +43,8 @@ mod write_to {
 
         fn default_time() -> Time {
             Time {
-                time: 0,
-                offset: 0,
+                seconds_since_unix_epoch: 0,
+                offset_in_seconds: 0,
                 sign: Sign::Plus,
             }
         }

git-actor/tests/time/mod.rs

@@ -6,24 +6,24 @@ fn write_to() -> Result<(), Box<dyn std::error::Error>> {
     for (time, expected) in &[
         (
             Time {
-                time: 500,
-                offset: 9000,
+                seconds_since_unix_epoch: 500,
+                offset_in_seconds: 9000,
                 sign: Sign::Plus,
             },
             "500 +0230",
         ),
         (
             Time {
-                time: 189009009,
-                offset: 36000,
+                seconds_since_unix_epoch: 189009009,
+                offset_in_seconds: 36000,
                 sign: Sign::Minus,
             },
             "189009009 -1000",
         ),
         (
             Time {
-                time: 0,
-                offset: 0,
+                seconds_since_unix_epoch: 0,
+                offset_in_seconds: 0,
                 sign: Sign::Minus,
             },
             "0 -0000",