From 622e1f69f725bc3b810460bbd597fc1eb31a8c0f Mon Sep 17 00:00:00 2001 From: Tony Arcieri Date: Tue, 31 Oct 2023 12:29:59 -0600 Subject: [PATCH] serdect: bump `toml` to v0.8 MSRV 1.70 --- .github/workflows/serdect.yml | 4 ++-- Cargo.lock | 17 ++++++++--------- serdect/Cargo.toml | 5 ++--- serdect/README.md | 4 ++-- 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/.github/workflows/serdect.yml b/.github/workflows/serdect.yml index 1447ba426..208989ec4 100644 --- a/.github/workflows/serdect.yml +++ b/.github/workflows/serdect.yml @@ -24,7 +24,7 @@ jobs: strategy: matrix: rust: - - 1.65.0 # MSRV + - 1.70.0 # MSRV - stable target: - thumbv7em-none-eabi @@ -48,7 +48,7 @@ jobs: strategy: matrix: rust: - - 1.65.0 # MSRV + - 1.70.0 # MSRV - stable steps: - uses: actions/checkout@v4 diff --git a/Cargo.lock b/Cargo.lock index 78bb4f652..1429d6cfd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1400,9 +1400,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" dependencies = [ "serde", ] @@ -1431,7 +1431,6 @@ dependencies = [ "serde-json-core", "serde_json", "toml", - "toml_edit", "zeroize", ] @@ -1624,9 +1623,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.6" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +checksum = "8ff9e3abce27ee2c9a37f9ad37238c1bdd4e789c84ba37df76aa4d528f5072cc" dependencies = [ "serde", "serde_spanned", @@ -1636,18 +1635,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.14" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" dependencies = [ "indexmap", "serde", diff --git a/serdect/Cargo.toml b/serdect/Cargo.toml index 3c5324ab1..85d93ef55 100644 --- a/serdect/Cargo.toml +++ b/serdect/Cargo.toml @@ -12,7 +12,7 @@ categories = ["cryptography", "encoding", "no-std", "parsing"] keywords = ["crypto", "constant-time", "serde"] readme = "README.md" edition = "2021" -rust-version = "1.60" +rust-version = "1.70" [dependencies] base16ct = { version = "0.2", default-features = false } @@ -30,8 +30,7 @@ rmp-serde = "1" serde = { version = "1.0.184", default-features = false, features = ["derive"] } serde_json = "1" serde-json-core = { version = "0.5", default-features = false, features = ["std"] } -toml = "0.7" -toml_edit = "=0.19.14" # pinned to preserve MSRV +toml = "0.8" [features] default = ["alloc"] diff --git a/serdect/README.md b/serdect/README.md index ac933c7b7..33223e510 100644 --- a/serdect/README.md +++ b/serdect/README.md @@ -41,7 +41,7 @@ help reduce the overall timing variability. ## Minimum Supported Rust Version -Rust **1.60** or newer. +Rust **1.70** or newer. In the future, we reserve the right to change MSRV (i.e. MSRV is out-of-scope for this crate's SemVer guarantees), however when we do it will be accompanied by @@ -69,7 +69,7 @@ dual licensed as above, without any additional terms or conditions. [docs-image]: https://docs.rs/serdect/badge.svg [docs-link]: https://docs.rs/serdect/ [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg -[msrv-image]: https://img.shields.io/badge/rustc-1.60+-blue.svg +[msrv-image]: https://img.shields.io/badge/rustc-1.70+-blue.svg [build-image]: https://github.com/RustCrypto/formats/actions/workflows/serdect.yml/badge.svg [build-link]: https://github.com/RustCrypto/formats/actions/workflows/serdect.yml