Merge branch 'develop'

Author: fpagliughi

CHANGELOG.md

@@ -7,6 +7,16 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v0.13.4](https://github.com/eclipse/paho.mqtt.rust/compare/v0.13.3..v0.13.4) - (2025-09-02)
+
+- Fixed some elided lifetime warnings
+- Bumped depedencies:
+    - thiserror to v2.0
+    - toml to v0.9
+- [#227](https://github.com/eclipse-paho/paho.mqtt.rust/issues/227) Bump async-channel to v2
+- [#248](https://github.com/eclipse-paho/paho.mqtt.rust/pull/248) Imlement binary password support
+
+
 ## [v0.13.3](https://github.com/eclipse/paho.mqtt.rust/compare/v0.13.2..v0.13.3) - (2025-04-28)
 
 - `TopicMatcher` implements `From(HashMap)` for the value type.

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "paho-mqtt"
-version = "0.13.3"
+version = "0.13.4"
 edition = "2021"
 rust-version = "1.73"
 authors = ["Frank Pagliughi <[email protected]>"]
@@ -26,14 +26,14 @@ paho-mqtt-sys = { version = "0.10", path = "paho-mqtt-sys", default-features=fal
 libc = "0.2"
 futures = "0.3"
 futures-timer = "3.0"
-async-channel = "1.6"
+async-channel = "2.3"
 crossbeam-channel = "0.5"
 log = "0.4"
-thiserror = "1.0"
+thiserror = "2.0"
 
 [dev-dependencies]
 env_logger = "0.11"
-toml = "0.8"
+toml = "0.9"
 serde = "1.0"
 serde_json = "1.0"
 lazy_static = "1.4"

examples/async_subscribe.rs

@@ -21,7 +21,7 @@
 //! broker to emit the LWT message.
 
 /*******************************************************************************
- * Copyright (c) 2017-2023 Frank Pagliughi <[email protected]>
+ * Copyright (c) 2017-2025 Frank Pagliughi <[email protected]>
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
@@ -36,7 +36,7 @@
  *    Frank Pagliughi - initial implementation and documentation
  *******************************************************************************/
 
-use futures::{executor::block_on, stream::StreamExt};
+use futures::executor::block_on;
 use paho_mqtt as mqtt;
 use std::{env, process, time::Duration};
 
@@ -71,7 +71,7 @@ fn main() {
 
     if let Err(err) = block_on(async {
         // Get message stream before connecting.
-        let mut strm = cli.get_stream(25);
+        let strm = cli.get_stream(25);
 
         // Define the set of options for the connection
         let lwt = mqtt::Message::new(
@@ -103,7 +103,7 @@ fn main() {
         // whatever) the server will get an unexpected drop and then
         // should emit the LWT message.
 
-        while let Some(msg_opt) = strm.next().await {
+        while let Ok(msg_opt) = strm.recv().await {
             if let Some(msg) = msg_opt {
                 println!("{}", msg);
             }

examples/async_subscribe_v5.rs

@@ -23,7 +23,7 @@
 //! broker to emit the LWT message.
 
 /*******************************************************************************
- * Copyright (c) 2017-2023 Frank Pagliughi <[email protected]>
+ * Copyright (c) 2017-2025 Frank Pagliughi <[email protected]>
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
@@ -38,7 +38,7 @@
  *    Frank Pagliughi - initial implementation and documentation
  *******************************************************************************/
 
-use futures::{executor::block_on, stream::StreamExt};
+use futures::executor::block_on;
 use paho_mqtt::{self as mqtt, MQTT_VERSION_5};
 use std::{env, process, time::Duration};
 
@@ -79,7 +79,7 @@ fn main() {
 
     if let Err(err) = block_on(async {
         // Get message stream before connecting.
-        let mut strm = cli.get_stream(25);
+        let strm = cli.get_stream(25);
 
         // Define the set of options for the connection
         let lwt = mqtt::Message::new(
@@ -114,7 +114,7 @@ fn main() {
         // whatever) the server will get an unexpected drop and then
         // should emit the LWT message.
 
-        while let Some(msg_opt) = strm.next().await {
+        while let Ok(msg_opt) = strm.recv().await {
             if let Some(msg) = msg_opt {
                 if msg.retained() {
                     print!("(R) ");

src/lib.rs

@@ -82,11 +82,28 @@
 extern crate log;
 extern crate paho_mqtt_sys as ffi;
 
+/// Re-export async_channel
 pub use async_channel::Receiver as AsyncReceiver;
-pub use crossbeam_channel::Receiver;
 
-pub use crate::async_client::*; //{AsyncClient, AsyncClientBuilder};
-pub use crate::client::*; //{Client, ClientBuilder};
+/// Re-export crossbeam channel as sync components
+pub use crossbeam_channel::{self as sync_channel, Receiver};
+
+/// The asynchronous API
+pub mod async_client;
+pub use crate::async_client::{
+    AsyncClient,
+    //AsyncClientBuilder,
+    ConnectedCallback,
+    ConnectionLostCallback,
+    DisconnectedCallback,
+    MessageArrivedCallback,
+    //SslErrorCallback,
+};
+
+/// The synchronous API
+pub mod client;
+pub use crate::client::Client; //ClientBuilder};
+
 pub use crate::client_persistence::*;
 pub use crate::connect_options::*; //{ConnectOptions, ConnectOptionsBuilder, MQTT_VERSION_3_1_1, ...};
 pub use crate::create_options::*; //{CreateOptions, CreateOptionsBuilder};
@@ -110,12 +127,6 @@ use std::{any::Any, os::raw::c_int};
 
 mod macros;
 
-/// The asynchronous API
-pub mod async_client;
-
-/// The synchronous API
-pub mod client;
-
 /// Client creation options
 pub mod create_options;
 

src/properties.rs

@@ -6,7 +6,7 @@
 //
 
 /*******************************************************************************
- * Copyright (c) 2019-2020 Frank Pagliughi <[email protected]>
+ * Copyright (c) 2019-2025 Frank Pagliughi <[email protected]>
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
@@ -976,7 +976,7 @@ impl Properties {
     }
 
     /// Gets an iterator for a property instance
-    pub fn iter(&self, code: PropertyCode) -> PropertyIterator {
+    pub fn iter(&self, code: PropertyCode) -> PropertyIterator<'_> {
         PropertyIterator {
             props: self,
             code,
@@ -1044,7 +1044,7 @@ impl Properties {
     }
 
     /// Gets an iterator into the user property string pairs.
-    pub fn user_iter(&self) -> StringPairIterator {
+    pub fn user_iter(&self) -> StringPairIterator<'_> {
         StringPairIterator {
             props: self,
             code: PropertyCode::UserProperty,

src/topic_matcher.rs

@@ -105,7 +105,7 @@ impl<T> Node<T> {
     }
 
     /// Gets an iterator for the node and _all_ of its children.
-    fn iter(&self) -> NodeIter<T> {
+    fn iter(&self) -> NodeIter<'_, T> {
         Box::new(
             self.value
                 .iter()
@@ -115,7 +115,7 @@ impl<T> Node<T> {
     }
 
     /// Gets a mutable iterator for the node and _all_ of its children.
-    fn iter_mut(&mut self) -> NodeIterMut<T> {
+    fn iter_mut(&mut self) -> NodeIterMut<'_, T> {
         Box::new(
             self.value
                 .iter_mut()
@@ -310,12 +310,12 @@ impl<T> TopicMatcher<T> {
     }
 
     /// Gets an iterator over all the items in the collection.
-    pub fn iter(&self) -> NodeIter<T> {
+    pub fn iter(&self) -> NodeIter<'_, T> {
         self.root.iter()
     }
 
     /// Gets a muable iterator over all the items in the collection.
-    pub fn iter_mut(&mut self) -> NodeIterMut<T> {
+    pub fn iter_mut(&mut self) -> NodeIterMut<'_, T> {
         self.root.iter_mut()
     }