From d69cefddfaac9586845ce0b67b2e7c83cf133db9 Mon Sep 17 00:00:00 2001 From: Richard Zak Date: Wed, 14 Feb 2024 22:02:00 -0500 Subject: [PATCH] chore: update MSRV, `half` Signed-off-by: Richard Zak --- .github/workflows/test.yml | 2 +- Cargo.toml | 1 + ciborium-io/Cargo.toml | 2 +- ciborium-ll/Cargo.toml | 4 ++-- ciborium/Cargo.toml | 6 +++--- ciborium/src/value/canonical.rs | 2 +- rust-toolchain.toml | 2 +- 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d3d21bc..750aa66 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: toolchain: - - 1.58.0 + - 1.70.0 - stable - beta - nightly diff --git a/Cargo.toml b/Cargo.toml index 9cbb069..342ae25 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,4 +1,5 @@ [workspace] +resolver = "2" exclude = [ ".gitignore", ".github/*" ] members = [ "ciborium", diff --git a/ciborium-io/Cargo.toml b/ciborium-io/Cargo.toml index d66bf51..6db6d04 100644 --- a/ciborium-io/Cargo.toml +++ b/ciborium-io/Cargo.toml @@ -4,7 +4,7 @@ version = "0.2.2" authors = ["Nathaniel McCallum "] license = "Apache-2.0" edition = "2021" -rust-version = "1.58" +rust-version = "1.70" homepage = "https://github.com/enarx/ciborium" repository = "https://github.com/enarx/ciborium" description = "Simplified Read/Write traits for no_std usage" diff --git a/ciborium-ll/Cargo.toml b/ciborium-ll/Cargo.toml index 2722030..616c6e0 100644 --- a/ciborium-ll/Cargo.toml +++ b/ciborium-ll/Cargo.toml @@ -4,7 +4,7 @@ version = "0.2.2" authors = ["Nathaniel McCallum "] license = "Apache-2.0" edition = "2021" -rust-version = "1.58" +rust-version = "1.70" homepage = "https://github.com/enarx/ciborium" repository = "https://github.com/enarx/ciborium" description = "Low-level CBOR codec primitives" @@ -22,7 +22,7 @@ is-it-maintained-open-issues = { repository = "enarx/ciborium" } [dependencies] ciborium-io = { path = "../ciborium-io", version = "0.2.2" } -half = { version = "2.2", default-features = false} +half = { version = "2.3.1", default-features = false} [dev-dependencies] hex = "0.4" diff --git a/ciborium/Cargo.toml b/ciborium/Cargo.toml index f13ee9f..c18ac47 100644 --- a/ciborium/Cargo.toml +++ b/ciborium/Cargo.toml @@ -4,7 +4,7 @@ version = "0.2.2" authors = ["Nathaniel McCallum "] license = "Apache-2.0" edition = "2021" -rust-version = "1.58" +rust-version = "1.70" homepage = "https://github.com/enarx/ciborium" repository = "https://github.com/enarx/ciborium" description = "serde implementation of CBOR using ciborium-basic" @@ -23,11 +23,11 @@ is-it-maintained-open-issues = { repository = "enarx/ciborium" } [dependencies] ciborium-ll = { path = "../ciborium-ll", version = "0.2.2" } ciborium-io = { path = "../ciborium-io", version = "0.2.2", features = ["alloc"] } -serde = { version = "1.0.100", default-features = false, features = ["alloc", "derive"] } +serde = { version = "1.0.170", default-features = false, features = ["alloc", "derive"] } [dev-dependencies] serde_bytes = "0.11" -rstest = "0.11" +rstest = "0.17" rand = "0.8" hex = "0.4" diff --git a/ciborium/src/value/canonical.rs b/ciborium/src/value/canonical.rs index f1196f4..072e1cf 100644 --- a/ciborium/src/value/canonical.rs +++ b/ciborium/src/value/canonical.rs @@ -119,6 +119,6 @@ impl Ord for CanonicalValue { impl PartialOrd for CanonicalValue { fn partial_cmp(&self, other: &Self) -> Option { - Some(cmp_value(&self.0, &other.0)) + Some(self.cmp(other)) } } diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 469a9e4..ba2eb3a 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "1.58" +channel = "1.70" profile = "minimal" components = ["rustfmt", "clippy"]