Merge pull request #1170 from weihanglo/netbsd

Byron · web-flow · commit 523692b6d9d4 · 2023-12-10T09:00:12.000+01:00
fix: NetBSD doesn't have `st_mtime_nsec` and `st_ctime_nsec`
diff --git a/gix-index/src/fs.rs b/gix-index/src/fs.rs
@@ -56,7 +56,10 @@ impl Metadata {
         {
             Some(system_time_from_secs_nanos(
                 self.0.st_mtime.try_into().ok()?,
+                #[cfg(not(target_os = "netbsd"))]
                 self.0.st_mtime_nsec.try_into().ok()?,
+                #[cfg(target_os = "netbsd")]
+                self.0.st_mtimensec.try_into().ok()?,
             ))
         }
         #[cfg(windows)]
@@ -72,7 +75,10 @@ impl Metadata {
         {
             Some(system_time_from_secs_nanos(
                 self.0.st_ctime.try_into().ok()?,
+                #[cfg(not(target_os = "netbsd"))]
                 self.0.st_ctime_nsec.try_into().ok()?,
+                #[cfg(target_os = "netbsd")]
+                self.0.st_ctimensec.try_into().ok()?,
             ))
         }
         #[cfg(windows)]

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,10 @@ impl Metadata {`
`56`	`56`	`{`
`57`	`57`	`Some(system_time_from_secs_nanos(`
`58`	`58`	`self.0.st_mtime.try_into().ok()?,`
	`59`	`+ #[cfg(not(target_os = "netbsd"))]`
`59`	`60`	`self.0.st_mtime_nsec.try_into().ok()?,`
	`61`	`+ #[cfg(target_os = "netbsd")]`
	`62`	`+ self.0.st_mtimensec.try_into().ok()?,`
`60`	`63`	`))`
`61`	`64`	`}`
`62`	`65`	`#[cfg(windows)]`
`@@ -72,7 +75,10 @@ impl Metadata {`
`72`	`75`	`{`
`73`	`76`	`Some(system_time_from_secs_nanos(`
`74`	`77`	`self.0.st_ctime.try_into().ok()?,`
	`78`	`+ #[cfg(not(target_os = "netbsd"))]`
`75`	`79`	`self.0.st_ctime_nsec.try_into().ok()?,`
	`80`	`+ #[cfg(target_os = "netbsd")]`
	`81`	`+ self.0.st_ctimensec.try_into().ok()?,`
`76`	`82`	`))`
`77`	`83`	`}`
`78`	`84`	`#[cfg(windows)]`