Merge pull request #340 from TheNeikos/update

Update deps
TheNeikos · Jan 8, 2025 · 0b95daa · 0b95daa
2 parents 773f445 + 20aebf8
commit 0b95daa
Show file tree

Hide file tree

Showing 9 changed files with 169 additions and 192 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,24 +1,22 @@
 {
   description = "The CloudMQTT Rust library";
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-23.11";
+    nixpkgs.url = "nixpkgs/nixos-24.11";
     flake-utils = {
       url = "github:numtide/flake-utils";
     };
     crane = {
       url = "github:ipetkov/crane";
-      inputs.nixpkgs.follows = "nixpkgs";
     };
     rust-overlay = {
       url = "github:oxalica/rust-overlay";
       inputs = {
         nixpkgs.follows = "nixpkgs";
-        flake-utils.follows = "flake-utils";
       };
     };
   };
 
-  outputs = { self, nixpkgs, crane, flake-utils, rust-overlay, ... }:
+  outputs = {  nixpkgs, crane, flake-utils, rust-overlay, ... }:
     flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = import nixpkgs {
@@ -34,7 +32,7 @@
         unstableCraneLib = (crane.mkLib pkgs).overrideToolchain unstableRustTarget;
 
         tomlInfo = craneLib.crateNameFromCargoToml { cargoToml = ./Cargo.toml; };
-        inherit (tomlInfo) pname version;
+        inherit (tomlInfo) version;
         src = ./.;
 
         rustfmt' = pkgs.writeShellScriptBin "rustfmt" ''

diff --git a/mqtt-format/src/v5/integers.rs b/mqtt-format/src/v5/integers.rs
@@ -90,7 +90,7 @@ where
                 .verify(|b: &u8| b & 0b1000_0000 == 0)
                 .context(winnow::error::StrContext::Label("last byte")),
         );
-        let bytes = var_bytes.recognize().parse_next(input)?;
+        let bytes = var_bytes.take().parse_next(input)?;
 
         let mut output: u32 = 0;
 

diff --git a/mqtt-format/src/v5/packets/suback.rs b/mqtt-format/src/v5/packets/suback.rs
@@ -64,7 +64,7 @@ impl<'i> MSuback<'i> {
                 SubackReasonCode::parse,
                 winnow::combinator::eof,
             )
-            .recognize()
+            .take()
             .parse_next(input)?;
 
             // SAFETY: We verified above that the payload slice only contains valid SubackReasonCode

diff --git a/mqtt-format/src/v5/packets/subscribe.rs b/mqtt-format/src/v5/packets/subscribe.rs
@@ -143,7 +143,7 @@ impl<'i> Subscriptions<'i> {
                 Subscription::parse,
                 winnow::combinator::eof,
             )
-            .recognize()
+            .take()
             .parse_next(input)?;
 
             Ok(Subscriptions { start })

diff --git a/mqtt-format/src/v5/packets/unsuback.rs b/mqtt-format/src/v5/packets/unsuback.rs
@@ -59,7 +59,7 @@ impl<'i> MUnsuback<'i> {
                 UnsubackReasonCode::parse,
                 winnow::combinator::eof,
             )
-            .recognize()
+            .take()
             .parse_next(input)?;
 
             // SAFETY: We verified above that the payload slice only contains valid UnsubackReasonCode

diff --git a/mqtt-format/src/v5/packets/unsubscribe.rs b/mqtt-format/src/v5/packets/unsubscribe.rs
@@ -55,7 +55,7 @@ impl<'i> Unsubscriptions<'i> {
                 Unsubscription::parse,
                 winnow::combinator::eof,
             )
-            .recognize()
+            .take()
             .parse_next(input)?;
 
             Ok(Unsubscriptions { start })

diff --git a/mqtt-format/src/v5/variable_header.rs b/mqtt-format/src/v5/variable_header.rs
@@ -360,7 +360,7 @@ impl<'i> MqttProperties<'i> for UserProperties<'i> {
             let slice = *input;
 
             // We only need to verify there is a correct string pair
-            let _prop = UserProperty::parse.recognize().parse_next(input)?;
+            let _prop = UserProperty::parse.take().parse_next(input)?;
 
             Ok(Self(slice))
         })