diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5018e0b0..040faac0 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -61,7 +61,7 @@ jobs: # It is good to test more than the MSRV and stable since sometimes # breakage occurs in intermediate versions. # IMPORTANT: Synchronize the MSRV with the Cargo.toml values. - rust: ["1.66", "1.70", "1.75", "stable", "beta", "nightly"] + rust: ["1.67", "1.70", "1.75", "stable", "beta", "nightly"] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 diff --git a/Cargo.lock b/Cargo.lock index e12350b8..3a8db010 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -195,6 +195,16 @@ dependencies = [ "syn", ] +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", + "serde", +] + [[package]] name = "diff" version = "0.1.13" @@ -534,6 +544,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-integer" version = "0.1.46" @@ -615,6 +631,12 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "pretty_assertions" version = "1.4.0" @@ -975,11 +997,14 @@ dependencies = [ [[package]] name = "time" -version = "0.3.20" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ + "deranged", "itoa", + "num-conv", + "powerfmt", "serde", "time-core", "time-macros", @@ -987,16 +1012,17 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.8" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] diff --git a/Cargo.toml b/Cargo.toml index 7657eb2c..b64f627d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ edition = "2021" license = "MIT OR Apache-2.0" readme = "README.md" repository = "https://github.com/jonasbb/serde_with/" -rust-version = "1.66" +rust-version = "1.67" version = "3.8.1" [workspace.metadata.release] diff --git a/serde_with/CHANGELOG.md b/serde_with/CHANGELOG.md index aaac8e5b..62d23b6c 100644 --- a/serde_with/CHANGELOG.md +++ b/serde_with/CHANGELOG.md @@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Changed -* Bump MSRV to 1.66, since that is required for the `rmp` dependency. +* Bump MSRV to 1.67, since that is required for the `time` dependency. ## [3.8.1] - 2024-04-28 diff --git a/serde_with/Cargo.toml b/serde_with/Cargo.toml index 5f8f1ce1..6a0e5fe3 100644 --- a/serde_with/Cargo.toml +++ b/serde_with/Cargo.toml @@ -134,7 +134,7 @@ serde = {version = "1.0.152", default-features = false} serde_derive = "1.0.152" serde_json = {version = "1.0.45", optional = true, default-features = false} serde_with_macros = {path = "../serde_with_macros", version = "=3.8.1", optional = true} -time_0_3 = {package = "time", version = "~0.3.11", optional = true, default-features = false} +time_0_3 = {package = "time", version = "~0.3.36", optional = true, default-features = false} [dev-dependencies] expect-test = "1.5.0" diff --git a/serde_with/tests/time_0_3.rs b/serde_with/tests/time_0_3.rs index 9067849d..6723fcd8 100644 --- a/serde_with/tests/time_0_3.rs +++ b/serde_with/tests/time_0_3.rs @@ -153,7 +153,7 @@ fn test_offset_datetime_rfc2822() { check_error_deserialization::( r#""Foobar""#, - expect![[r#"the 'weekday' component could not be parsed at line 1 column 8"#]], + expect!["the 'day' component could not be parsed at line 1 column 8"], ); check_error_deserialization::( r#""Fri, 2000""#, @@ -266,6 +266,6 @@ fn test_offset_datetime_iso8601() { ); check_error_deserialization::( r#""2000-AA""#, - expect!["unexpected trailing characters at line 1 column 9"], + expect!["unexpected trailing characters; the end of input was expected at line 1 column 9"], ); }