From 885ef5c57161fe9471dc7d85bdb3f17da59731a5 Mon Sep 17 00:00:00 2001 From: Nicolas Burtey Date: Tue, 17 Mar 2026 09:27:43 -0600 Subject: [PATCH 1/3] chore(deps): bump es-entity from 0.10.27 to 0.10.28 and serde_with from 3.14 to 3.18 Co-Authored-By: Claude Opus 4.6 (1M context) --- Cargo.lock | 53 +++++++++-------------------------------------------- Cargo.toml | 4 ++-- 2 files changed, 11 insertions(+), 46 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9f99069..27906e7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -258,16 +258,6 @@ dependencies = [ "darling_macro 0.20.11", ] -[[package]] -name = "darling" -version = "0.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0" -dependencies = [ - "darling_core 0.21.3", - "darling_macro 0.21.3", -] - [[package]] name = "darling" version = "0.23.0" @@ -292,20 +282,6 @@ dependencies = [ "syn", ] -[[package]] -name = "darling_core" -version = "0.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn", -] - [[package]] name = "darling_core" version = "0.23.0" @@ -330,17 +306,6 @@ dependencies = [ "syn", ] -[[package]] -name = "darling_macro" -version = "0.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" -dependencies = [ - "darling_core 0.21.3", - "quote", - "syn", -] - [[package]] name = "darling_macro" version = "0.23.0" @@ -456,9 +421,9 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "es-entity" -version = "0.10.27" +version = "0.10.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d99d307ef96f2d79218c8d39a1da3fb5e8f1439a509558fb87aef0721547b416" +checksum = "51de953f5d065af7e4c47414f66c9638acfab53b8f6a9d5c56305f892cdd895d" dependencies = [ "chrono", "derive_builder", @@ -481,9 +446,9 @@ dependencies = [ [[package]] name = "es-entity-macros" -version = "0.10.27" +version = "0.10.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe53aed1d1a568b4a487be142eb084eeb5e36f6375671a64af02340a09a5654" +checksum = "bfd932759b01ef59116a1228a15bf575e75083a87da71d0dc1c73a1c1dcc58bd" dependencies = [ "convert_case", "darling 0.23.0", @@ -1697,9 +1662,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.17.0" +version = "3.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "381b283ce7bc6b476d903296fb59d0d36633652b633b27f64db4fb46dcbfc3b9" +checksum = "dd5414fad8e6907dbdd5bc441a50ae8d6e26151a03b1de04d89a5576de61d01f" dependencies = [ "base64", "chrono", @@ -1716,11 +1681,11 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.17.0" +version = "3.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6d4e30573c8cb306ed6ab1dca8423eec9a463ea0e155f45399455e0368b27e0" +checksum = "d3db8978e608f1fe7357e211969fd9abdcae80bac1ba7a3369bb7eb6b404eb65" dependencies = [ - "darling 0.21.3", + "darling 0.23.0", "proc-macro2", "quote", "syn", diff --git a/Cargo.toml b/Cargo.toml index 9b4cd1c..f9fd674 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,7 +42,7 @@ anyhow = { workspace = true } [workspace.dependencies] -es-entity = "0.10.27" +es-entity = "0.10.28" anyhow = "1.0" async-trait = "0.1" @@ -52,7 +52,7 @@ tracing = { version = "0.1" } sqlx = { version = "0.8", features = ["macros", "runtime-tokio-rustls", "postgres", "uuid", "chrono", "json" ] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -serde_with = "3.14" +serde_with = "3.18" thiserror = "2.0" tokio = { version = "1.50", features = ["rt-multi-thread", "macros"] } uuid = { version = "1.22", features = ["serde", "v7"] } From bb95439edab04179e3efdcf87d073882027ea0c2 Mon Sep 17 00:00:00 2001 From: Nicolas Burtey Date: Tue, 17 Mar 2026 09:30:47 -0600 Subject: [PATCH 2/3] fix: update code for es-entity 0.10.28 API changes Remove ArtificialClockConfig and ArtificialMode re-exports and usage, replaced by ClockHandle::manual() following upstream API simplification. Co-Authored-By: Claude Opus 4.6 (1M context) --- src/lib.rs | 8 +++----- tests/job.rs | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 8f073c0..9af423c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -189,9 +189,9 @@ //! inject an artificial clock via [`JobSvcConfig::clock`]: //! //! ```ignore -//! use job::{JobSvcConfig, ClockHandle, ArtificialClockConfig}; +//! use job::{JobSvcConfig, ClockHandle}; //! -//! let (clock, controller) = ClockHandle::artificial(ArtificialClockConfig::manual()); +//! let (clock, controller) = ClockHandle::manual(); //! let config = JobSvcConfig::builder() //! .pool(pool) //! .clock(clock) @@ -229,9 +229,7 @@ use std::sync::{Arc, Mutex}; pub use config::*; pub use current::*; pub use entity::{Job, JobTerminalState, JobType}; -pub use es_entity::clock::{ - ArtificialClockConfig, ArtificialMode, Clock, ClockController, ClockHandle, -}; +pub use es_entity::clock::{Clock, ClockController, ClockHandle}; pub use migrate::*; pub use registry::*; pub use runner::*; diff --git a/tests/job.rs b/tests/job.rs index 149bb77..c2d4f12 100644 --- a/tests/job.rs +++ b/tests/job.rs @@ -3,7 +3,7 @@ mod helpers; use async_trait::async_trait; use chrono::{DateTime, Utc}; use job::{ - ArtificialClockConfig, ClockHandle, CurrentJob, Job, JobCompletion, JobId, JobInitializer, + ClockHandle, CurrentJob, Job, JobCompletion, JobId, JobInitializer, JobRunner, JobSpawner, JobSpec, JobSvcConfig, JobTerminalState, JobType, Jobs, RetrySettings, error::JobError, }; @@ -150,8 +150,8 @@ impl JobRunner for ScheduledJobRunner { async fn test_scheduled_job_with_artificial_clock() -> anyhow::Result<()> { let pool = helpers::init_pool().await?; - // Create an artificial clock for deterministic testing - let (clock, controller) = ClockHandle::artificial(ArtificialClockConfig::manual()); + // Create a manual clock for deterministic testing + let (clock, controller) = ClockHandle::manual(); let initial_time = clock.now(); let config = JobSvcConfig::builder() From 2bb0cb356f387bdd8cf2614ce0ec8ac11fce7934 Mon Sep 17 00:00:00 2001 From: Nicolas Burtey Date: Tue, 17 Mar 2026 09:36:31 -0600 Subject: [PATCH 3/3] style: fix formatting in tests/job.rs Co-Authored-By: Claude Opus 4.6 (1M context) --- tests/job.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/job.rs b/tests/job.rs index c2d4f12..2432e03 100644 --- a/tests/job.rs +++ b/tests/job.rs @@ -3,9 +3,8 @@ mod helpers; use async_trait::async_trait; use chrono::{DateTime, Utc}; use job::{ - ClockHandle, CurrentJob, Job, JobCompletion, JobId, JobInitializer, - JobRunner, JobSpawner, JobSpec, JobSvcConfig, JobTerminalState, JobType, Jobs, RetrySettings, - error::JobError, + ClockHandle, CurrentJob, Job, JobCompletion, JobId, JobInitializer, JobRunner, JobSpawner, + JobSpec, JobSvcConfig, JobTerminalState, JobType, Jobs, RetrySettings, error::JobError, }; use serde::{Deserialize, Serialize}; use std::sync::Arc;