Merge pull request #10 from RobertZ2011/bincode-update

Update for dependency changes

.github/workflows/check.yml

@@ -204,7 +204,7 @@ jobs:
       fail-fast: false
       matrix:
         commit: ${{ fromJSON(needs.commit_list.outputs.commits) }}
-        msrv: ["1.83"] # We're relying on namespaced-features, which
+        msrv: ["1.85"] # We're relying on namespaced-features, which
                        # was released in 1.60
                        #
                        # We also depend on `fixed' which requires rust
@@ -215,6 +215,7 @@ jobs:
                        #
                        # embassy-time requires 1.79 due to
                        # collapse_debuginfo
+                       # bincode requires 1.85
     name: ubuntu / ${{ matrix.msrv }} (${{ matrix.commit }})
     steps:
       - uses: actions/checkout@v4

Cargo.toml

@@ -17,9 +17,7 @@ defmt = { version = "0.3.0", optional = true }
 log = { version = "0.4.14", optional = true }
 embassy-sync = { git = "https://github.com/embassy-rs/embassy", optional = true }
 embassy-time = { git = "https://github.com/embassy-rs/embassy", optional = true }
-bincode = { version = "2.0.0-rc.3", default-features = false, features = [
-    "derive",
-] }
+bincode = { version = "2.0.0", default-features = false, features = ["derive"] }
 
 [features]
 default = []

deny.toml

@@ -86,27 +86,20 @@ ignore = [
 # More documentation for the licenses section can be found here:
 # https://embarkstudios.github.io/cargo-deny/checks/licenses/cfg.html
 [licenses]
+allow = ["MIT", "Apache-2.0", "Unicode-3.0"]
+
 # List of explicitly allowed licenses
 # See https://spdx.org/licenses/ for list of possible licenses
 # [possible values: any SPDX 3.11 short identifier (+ optional exception)].
-allow = [
-    "MIT",
-    "Apache-2.0",
-    "Unicode-DFS-2016",
-    #"Apache-2.0 WITH LLVM-exception",
-]
+#"Apache-2.0 WITH LLVM-exception",
 # The confidence threshold for detecting a license from license text.
 # The higher the value, the more closely the license text must be to the
 # canonical license text of a valid SPDX license file.
 # [possible values: any between 0.0 and 1.0].
 confidence-threshold = 0.8
 # Allow 1 or more licenses on a per-crate basis, so that particular licenses
 # aren't accepted for every possible crate as with the normal allow list
-exceptions = [
-    # Each entry is the crate and version constraint, and its specific allow
-    # list
-    #{ allow = ["Zlib"], crate = "adler32" },
-]
+exceptions = [{ allow = ["BSD-3-Clause"], crate = "encoding_rs" }]
 
 # Some crates don't have (easily) machine readable licensing information,
 # adding a clarification entry for it allows you to manually specify the

src/command.rs

@@ -302,7 +302,7 @@ impl TryFrom<u8> for TfuqBlockStatus {
     }
 }
 
-impl Decode for TfuqBlockStatus {
+impl<Context> Decode<Context> for TfuqBlockStatus {
     fn decode<D: Decoder>(decoder: &mut D) -> Result<Self, DecodeError> {
         let val: u8 = Decode::decode(decoder)?;
         TfuqBlockStatus::try_from(val).map_err(|_| DecodeError::Other("Invalid TfuqBlockStatus"))
@@ -342,7 +342,7 @@ pub struct TfuqReturnValue {
     pub num_of_app_config_updates: u16,
 }
 
-impl Decode for TfuqReturnValue {
+impl<Context> Decode<Context> for TfuqReturnValue {
     fn decode<D: Decoder>(decoder: &mut D) -> Result<Self, DecodeError> {
         let active_host = Decode::decode(decoder)?;
         let current_state = Decode::decode(decoder)?;

src/lib.rs

@@ -26,8 +26,7 @@ pub const PORT1: PortId = PortId(1);
 
 pub mod registers {
     use device_driver;
-    use embedded_usb_pd::type_c;
-    use embedded_usb_pd::PdError;
+    use embedded_usb_pd::{type_c, PdError};
     device_driver::create_device!(
         device_name: Registers,
         manifest: "device.yaml"