chore: update MSRV, hex

Signed-off-by: Richard Zak <[email protected]>

Cargo.toml

@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 exclude = [ ".gitignore", ".github/*" ]
 members = [
     "ciborium",

ciborium-io/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.2.2"
 authors = ["Nathaniel McCallum <[email protected]>"]
 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"

ciborium-ll/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.2.2"
 authors = ["Nathaniel McCallum <[email protected]>"]
 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"

ciborium/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.2.2"
 authors = ["Nathaniel McCallum <[email protected]>"]
 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"
 

ciborium/src/value/canonical.rs

@@ -119,6 +119,6 @@ impl Ord for CanonicalValue {
 
 impl PartialOrd for CanonicalValue {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        Some(cmp_value(&self.0, &other.0))
+        Some(self.cmp(other))
     }
 }

rust-toolchain.toml

@@ -1,4 +1,4 @@
 [toolchain]
-channel = "1.58"
+channel = "1.70"
 profile = "minimal"
 components = ["rustfmt", "clippy"]