Switch from chrono to jiff for timestamp handling
chrono was declared but never imported — timestamps were raw Strings from SQLite. Introduced a Timestamp newtype wrapping jiff::Timestamp with sqlx Decode/Encode and serde support, replacing String fields in Backlog, Task, and Comment models. Assisted-by: Claude Opus 4.6 via pi
diff --git a/Cargo.lock b/Cargo.lock
index d6aaedb..cca6353 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8,15 +8,6 @@ version = "0.2.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
-[[package]]
-name = "android_system_properties"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
-dependencies = [
- "libc",
-]
-
[[package]]
name = "anstream"
version = "0.6.21"
@@ -144,12 +135,6 @@ dependencies = [
"serde",
]
-[[package]]
-name = "bumpalo"
-version = "3.20.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb"
-
[[package]]
name = "byteorder"
version = "1.5.0"
@@ -178,20 +163,6 @@ version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
-[[package]]
-name = "chrono"
-version = "0.4.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0"
-dependencies = [
- "iana-time-zone",
- "js-sys",
- "num-traits",
- "serde",
- "wasm-bindgen",
- "windows-link",
-]
-
[[package]]
name = "clap"
version = "4.5.60"
@@ -253,12 +224,6 @@ version = "0.9.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
-
[[package]]
name = "cpufeatures"
version = "0.2.17"
@@ -609,30 +574,6 @@ dependencies = [
"windows-sys 0.61.2",
]
-[[package]]
-name = "iana-time-zone"
-version = "0.1.65"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470"
-dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "iana-time-zone-haiku",
- "js-sys",
- "log",
- "wasm-bindgen",
- "windows-core",
-]
-
-[[package]]
-name = "iana-time-zone-haiku"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
-dependencies = [
- "cc",
-]
-
[[package]]
name = "icu_collections"
version = "2.1.1"
@@ -766,13 +707,44 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"
[[package]]
-name = "js-sys"
-version = "0.3.91"
+name = "jiff"
+version = "0.2.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b49715b7073f385ba4bc528e5747d02e66cb39c6146efb66b781f131f0fb399c"
+checksum = "1a3546dc96b6d42c5f24902af9e2538e82e39ad350b0c766eb3fbf2d8f3d8359"
dependencies = [
- "once_cell",
- "wasm-bindgen",
+ "jiff-static",
+ "jiff-tzdb-platform",
+ "log",
+ "portable-atomic",
+ "portable-atomic-util",
+ "serde_core",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "jiff-static"
+version = "0.2.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a8c8b344124222efd714b73bb41f8b5120b27a7cc1c75593a6ff768d9d05aa4"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "jiff-tzdb"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c900ef84826f1338a557697dc8fc601df9ca9af4ac137c7fb61d4c6f2dfd3076"
+
+[[package]]
+name = "jiff-tzdb-platform"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "875a5a69ac2bab1a891711cf5eccbec1ce0341ea805560dcd90b7a2e925132e8"
+dependencies = [
+ "jiff-tzdb",
]
[[package]]
@@ -1020,6 +992,21 @@ version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
+[[package]]
+name = "portable-atomic"
+version = "1.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49"
+
+[[package]]
+name = "portable-atomic-util"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a9db96d7fa8782dd8c15ce32ffe8680bbd1e978a43bf51a34d39483540495f5"
+dependencies = [
+ "portable-atomic",
+]
+
[[package]]
name = "potential_utf"
version = "0.1.4"
@@ -1135,8 +1122,8 @@ version = "0.1.0"
dependencies = [
"anyhow",
"assert_cmd",
- "chrono",
"clap",
+ "jiff",
"rand",
"serde",
"serde_json",
@@ -1204,12 +1191,6 @@ dependencies = [
"windows-sys 0.61.2",
]
-[[package]]
-name = "rustversion"
-version = "1.0.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
-
[[package]]
name = "ryu"
version = "1.0.23"
@@ -1863,51 +1844,6 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.114"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6532f9a5c1ece3798cb1c2cfdba640b9b3ba884f5db45973a6f442510a87d38e"
-dependencies = [
- "cfg-if",
- "once_cell",
- "rustversion",
- "wasm-bindgen-macro",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.114"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18a2d50fcf105fb33bb15f00e7a77b772945a2ee45dcf454961fd843e74c18e6"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.114"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03ce4caeaac547cdf713d280eda22a730824dd11e6b8c3ca9e42247b25c631e3"
-dependencies = [
- "bumpalo",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.114"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75a326b8c223ee17883a4251907455a2431acc2791c98c26279376490c378c16"
-dependencies = [
- "unicode-ident",
-]
-
[[package]]
name = "wasm-encoder"
version = "0.244.0"
@@ -1952,65 +1888,12 @@ dependencies = [
"wasite",
]
-[[package]]
-name = "windows-core"
-version = "0.62.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
-dependencies = [
- "windows-implement",
- "windows-interface",
- "windows-link",
- "windows-result",
- "windows-strings",
-]
-
-[[package]]
-name = "windows-implement"
-version = "0.60.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "windows-interface"
-version = "0.59.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
[[package]]
name = "windows-link"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
-[[package]]
-name = "windows-result"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
-dependencies = [
- "windows-link",
-]
-
-[[package]]
-name = "windows-strings"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091"
-dependencies = [
- "windows-link",
-]
-
[[package]]
name = "windows-sys"
version = "0.48.0"
diff --git a/Cargo.toml b/Cargo.toml
index 99dad85..ee468c6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,7 +9,7 @@ path = "src/bin/ranger/main.rs"
[dependencies]
anyhow = "*"
-chrono = { version = "*", features = ["serde"] }
+jiff = { version = "*", features = ["serde"] }
clap = { version = "*", features = ["derive", "env"] }
rand = "*"
serde = { version = "*", features = ["derive"] }
diff --git a/src/lib.rs b/src/lib.rs
index 646ff77..1c6e368 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -4,3 +4,4 @@ pub mod key;
pub mod models;
pub mod ops;
pub mod position;
+pub mod timestamp;
diff --git a/src/models.rs b/src/models.rs
index 5c51891..dc9d992 100644
--- a/src/models.rs
+++ b/src/models.rs
@@ -1,6 +1,8 @@
use serde::{Deserialize, Serialize};
use sqlx::FromRow;
+use crate::timestamp::Timestamp;
+
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "snake_case")]
pub enum State {
@@ -68,8 +70,8 @@ pub struct Backlog {
pub id: i64,
pub key: String,
pub name: String,
- pub created_at: String,
- pub updated_at: String,
+ pub created_at: Timestamp,
+ pub updated_at: Timestamp,
}
#[derive(Debug, Clone, Serialize, Deserialize, FromRow)]
@@ -80,8 +82,8 @@ pub struct Task {
pub title: String,
pub description: Option<String>,
pub state: State,
- pub created_at: String,
- pub updated_at: String,
+ pub created_at: Timestamp,
+ pub updated_at: Timestamp,
}
#[derive(Debug, Clone, Serialize, Deserialize, FromRow)]
@@ -89,7 +91,7 @@ pub struct Comment {
pub id: i64,
pub task_id: i64,
pub body: String,
- pub created_at: String,
+ pub created_at: Timestamp,
}
#[derive(Debug, Clone, Serialize, Deserialize, FromRow)]
diff --git a/src/timestamp.rs b/src/timestamp.rs
new file mode 100644
index 0000000..f6a5afb
--- /dev/null
+++ b/src/timestamp.rs
@@ -0,0 +1,58 @@
+use serde::{Deserialize, Serialize};
+
+/// UTC timestamp backed by `jiff::Timestamp`.
+///
+/// Wraps `jiff::Timestamp` with `sqlx` and `serde` integration so it can be
+/// used directly in model structs that derive `FromRow`.
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(transparent)]
+pub struct Timestamp(pub jiff::Timestamp);
+
+impl std::fmt::Display for Timestamp {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ write!(f, "{}", self.0.strftime("%Y-%m-%dT%H:%M:%SZ"))
+ }
+}
+
+impl sqlx::Type<sqlx::Sqlite> for Timestamp {
+ fn type_info() -> sqlx::sqlite::SqliteTypeInfo {
+ <str as sqlx::Type<sqlx::Sqlite>>::type_info()
+ }
+}
+
+impl<'r> sqlx::Decode<'r, sqlx::Sqlite> for Timestamp {
+ fn decode(value: sqlx::sqlite::SqliteValueRef<'r>) -> Result<Self, sqlx::error::BoxDynError> {
+ let s = <&str as sqlx::Decode<sqlx::Sqlite>>::decode(value)?;
+ let ts: jiff::Timestamp = s.parse()?;
+ Ok(Timestamp(ts))
+ }
+}
+
+impl sqlx::Encode<'_, sqlx::Sqlite> for Timestamp {
+ fn encode_by_ref(
+ &self,
+ buf: &mut <sqlx::Sqlite as sqlx::Database>::ArgumentBuffer<'_>,
+ ) -> Result<sqlx::encode::IsNull, sqlx::error::BoxDynError> {
+ let s = self.to_string();
+ <String as sqlx::Encode<sqlx::Sqlite>>::encode(s, buf)
+ }
+}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+
+ #[test]
+ fn display_formats_as_iso8601() {
+ let ts = Timestamp(jiff::Timestamp::from_second(1_700_000_000).unwrap());
+ assert_eq!(ts.to_string(), "2023-11-14T22:13:20Z");
+ }
+
+ #[test]
+ fn serde_roundtrips() {
+ let ts = Timestamp(jiff::Timestamp::from_second(1_700_000_000).unwrap());
+ let json = serde_json::to_string(&ts).unwrap();
+ let deserialized: Timestamp = serde_json::from_str(&json).unwrap();
+ assert_eq!(ts, deserialized);
+ }
+}