Merge pull request #1838 from tisonkun/jiff02

Byron · web-flow · commit b310c16abbf1 · 2025-02-12T07:40:59.000+01:00
build: upgrade to jiff 0.2
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/gix-archive/Cargo.toml b/gix-archive/Cargo.toml
@@ -34,7 +34,7 @@ gix-date = { version = "^0.9.3", path = "../gix-date" }
 
 flate2 = { version = "1.0.33", optional = true }
 zip = { version = "2.1.0", optional = true, default-features = false, features = ["deflate"] }
-jiff = { version = "0.1.2", default-features = false, features = ["std"] }
+jiff = { version = "0.2.0", default-features = false, features = ["std"] }
 
 thiserror = "2.0.0"
 bstr = { version = "1.5.0", default-features = false }
diff --git a/gix-date/Cargo.toml b/gix-date/Cargo.toml
@@ -22,7 +22,7 @@ serde = ["dep:serde", "bstr/serde"]
 bstr = { version = "1.3.0", default-features = false, features = ["std"] }
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }
 itoa = "1.0.1"
-jiff = "0.1.1"
+jiff = "0.2.0"
 thiserror = "2.0.0"
 
 document-features = { version = "0.2.0", optional = true }
diff --git a/gix-date/src/parse.rs b/gix-date/src/parse.rs
@@ -167,7 +167,8 @@ mod relative {
 
         #[test]
         fn two_weeks_ago() {
-            assert_eq!(parse_inner("2 weeks ago").unwrap().unwrap(), Span::new().weeks(2));
+            let actual = parse_inner("2 weeks ago").unwrap().unwrap();
+            assert_eq!(actual.fieldwise(), Span::new().weeks(2));
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,8 @@ mod relative {`
`167`	`167`
`168`	`168`	`#[test]`
`169`	`169`	`fn two_weeks_ago() {`
`170`		`- assert_eq!(parse_inner("2 weeks ago").unwrap().unwrap(), Span::new().weeks(2));`
	`170`	`+ let actual = parse_inner("2 weeks ago").unwrap().unwrap();`
	`171`	`+ assert_eq!(actual.fieldwise(), Span::new().weeks(2));`
`171`	`172`	`}`
`172`	`173`	`}`
`173`	`174`	`}`