Upgraded dependency to Paho v0.12. Made other dependencies current.

Author: fpagliughi

.gitignore

@@ -1,3 +1,6 @@
 /target/
 **/*.rs.bk
 Cargo.lock
+/*.vp*
+/*.vtg
+/.vscode/

CHANGELOG.md

@@ -3,7 +3,18 @@ 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.3.0](https://github.com/fpagliughi/mqtt.rust.redis/compare/v0.3.0..v0.2.2) - 2021-01-04
+## [v0.3.2](https://github.com/fpagliughi/mqtt.rust.redis/compare/v0.3.1..v0.3.2) - 2023-10-26
+
+- Updated to Paho Rust v0.12
+- Updated Rust Edition to 2021
+- 
+
+## [v0.3.1](https://github.com/fpagliughi/mqtt.rust.redis/compare/v0.3.0..v0.3.1) - 2022-01-25
+
+- Updated to Paho Rust v0.10
+
+
+## [v0.3.0](https://github.com/fpagliughi/mqtt.rust.redis/compare/v0.2.2..v0.3.0) - 2021-01-04
 
 - Updated to use Paho Rust v0.9
 - Updated Rust Edition to 2018

Cargo.toml

@@ -1,7 +1,8 @@
 [package]
 name = "paho-mqtt-redis"
-version = "0.3.1"
-edition = "2018"
+version = "0.3.2"
+edition = "2021"
+rust_version = "1.63.0"
 authors = ["Frank Pagliughi <fpagliughi@mindspring.com>"]
 homepage = "https://github.com/fpagliughi/mqtt.rust.redis"
 repository = "https://github.com/fpagliughi/mqtt.rust.redis"
@@ -13,10 +14,10 @@ a local instance of Redis as the backing store.
 """
 
 [dependencies]
-paho-mqtt = "0.10"
-redis = "0.21"
+paho-mqtt = "0.12"
+redis = "0.23"
 log = "0.4"
 
 [dev-dependencies]
-env_logger = "0.9"
+env_logger = "0.10"
 

README.md

@@ -17,7 +17,7 @@ The Paho MQTT Rust library is a wrapper around the Paho C library. It can be inc
 
 ```
 [dependencies]
-paho-mqtt = "0.9"
+paho-mqtt = "0.12"
 paho-mqtt-redis = "0.3"
 ```
 
@@ -75,9 +75,9 @@ It can be done like this:
 let persistence = RedisPersistence::new();
 
 let opts = mqtt::CreateOptionsBuilder::new()
-                   .server_uri("tcp://localhost:1883")
-                   .user_persistence(persistence)
-                   .finalize();
+    .server_uri("tcp://localhost:1883")
+    .user_persistence(persistence)
+    .finalize();
 
 let cli = mqtt::AsyncClient::new(opts).unwrap_or_else(|e| {
     println!("Error creating the client: {:?}", e);

examples/redis_persist_pub.rs

@@ -1,14 +1,14 @@
 // redis_persist_pub.rs
-// 
+//
 // Example/test for mqtt-redis.
-// 
+//
 // This shows how to to use mqtt-redis with the Paho MQTT Rust library
 // in order to have a local Redis server as the persistence store for the
 // messaging application.
 //
 
 // --------------------------------------------------------------------------
-// Copyright (c) 2017-2020 Frank Pagliughi <fpagliughi@mindspring.com>
+// Copyright (c) 2017-2023 Frank Pagliughi <fpagliughi@mindspring.com>
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
 // LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 // NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// 
+//
 
 use std::{env, process};
 
@@ -48,57 +48,57 @@ use paho_mqtt_redis::RedisPersistence;
 
 fn main() {
     // Use the environment logger for this example.
-	env_logger::init();
+    env_logger::init();
 
-    let host = env::args().skip(1).next().unwrap_or(
-        "tcp://localhost:1883".to_string()
-    );
+    let host = env::args()
+        .nth(1)
+        .unwrap_or_else(|| "tcp://localhost:1883".to_string());
 
-	println!("Connecting to MQTT broker at: '{}'", host);
+    println!("Connecting to MQTT broker at: '{}'", host);
 
-	// Create a client & define connect options
-	let persistence = RedisPersistence::new();
+    // Create a client & define connect options
+    let persistence = RedisPersistence::new();
 
-	let create_opts = mqtt::CreateOptionsBuilder::new()
-			.server_uri(host)
-			.client_id("rust_redis_pub")
-			.user_persistence(persistence)
-			.finalize();
+    let create_opts = mqtt::CreateOptionsBuilder::new()
+        .server_uri(host)
+        .client_id("rust_redis_pub")
+        .user_persistence(persistence)
+        .finalize();
 
-	let cli = mqtt::AsyncClient::new(create_opts).unwrap_or_else(|err| {
+    let cli = mqtt::AsyncClient::new(create_opts).unwrap_or_else(|err| {
         match err {
-            mqtt::Error::Paho(-2 /*mqtt::PERSISTENCE_ERROR*/) =>
-                eprintln!("Error connecting to the local Redis server. Is it running?"),
-            _ =>
-                eprintln!("Error creating the client: {:?}", err)
+            mqtt::Error::Paho(-2 /*mqtt::PERSISTENCE_ERROR*/) => {
+                eprintln!("Error connecting to the local Redis server. Is it running?")
+            }
+            _ => eprintln!("Error creating the client: {:?}", err),
         };
-		process::exit(2);
-	});
+        process::exit(2);
+    });
 
-	// Connect and wait for it to complete or fail
-	if let Err(e) = cli.connect(None).wait() {
-		println!("Unable to connect: {:?}", e);
-		process::exit(1);
-	}
+    // Connect and wait for it to complete or fail
+    if let Err(e) = cli.connect(None).wait() {
+        println!("Unable to connect: {:?}", e);
+        process::exit(1);
+    }
 
-	// Create a message and publish it
+    // Create a message and publish it
     // Use non-zero QoS to exercise message persistence
-	println!("Publishing a message to 'test' topic");
+    println!("Publishing a message to 'test' topic");
 
     let msg = mqtt::Message::new("test", "Hello world!", mqtt::QOS_1);
-	let tok = cli.publish(msg);
+    let tok = cli.publish(msg);
 
-	if let Err(e) = tok.wait() {
-		println!("Error sending message: {:?}", e);
-	}
+    if let Err(e) = tok.wait() {
+        println!("Error sending message: {:?}", e);
+    }
 
-	// Disconnect from the broker
-	println!("Disconnecting from the broker.");
+    // Disconnect from the broker
+    println!("Disconnecting from the broker.");
 
-	let tok = cli.disconnect(None);
-	tok.wait().unwrap();
+    let tok = cli.disconnect(None);
+    tok.wait().unwrap();
 
-	println!("Done");
+    println!("Done");
 
     drop(cli);
     println!("Exiting");

src/lib.rs

@@ -1,9 +1,9 @@
 // mqtt.rust.redis/src/lib.rs
-// 
+//
 // Main library source file for 'mqtt-redis'.
 //
 // --------------------------------------------------------------------------
-// Copyright (c) 2017-2020 Frank Pagliughi <fpagliughi@mindspring.com>
+// Copyright (c) 2017-2023 Frank Pagliughi <fpagliughi@mindspring.com>
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -32,7 +32,7 @@
 // LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 // NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// 
+//
 
 //! This is a small example of using Redis as the persistence store for the
 //! Paho MQTT Rust client.
@@ -81,10 +81,11 @@
 //! use a remote Redis server for this purpose.
 //!
 
-#[macro_use] extern crate log;
+#[macro_use]
+extern crate log;
 
 use paho_mqtt as mqtt;
-use redis::{Client, Commands, Connection, RedisResult };
+use redis::{Client, Commands, Connection, RedisResult};
 
 // --------------------------------------------------------------------------
 
@@ -107,7 +108,9 @@ pub struct RedisPersistence {
 
 impl RedisPersistence {
     /// Create a new persistence object to connect to a local Redis server.
-    pub fn new() -> Self { Self::default() }
+    pub fn new() -> Self {
+        Self::default()
+    }
 }
 
 impl Default for RedisPersistence {
@@ -122,8 +125,7 @@ impl Default for RedisPersistence {
     }
 }
 
-impl mqtt::ClientPersistence for RedisPersistence
-{
+impl mqtt::ClientPersistence for RedisPersistence {
     /// Opena the connection to the Redis client.
     fn open(&mut self, client_id: &str, server_uri: &str) -> mqtt::Result<()> {
         self.name = format!("{}:{}", client_id, server_uri);
@@ -136,7 +138,7 @@ impl mqtt::ClientPersistence for RedisPersistence
             }
             Err(e) => {
                 warn!("Redis persistence connect error: {:?}", e);
-                return Err(mqtt::PersistenceError)?
+                Err(mqtt::PersistenceError)
             }
         }
     }
@@ -159,7 +161,11 @@ impl mqtt::ClientPersistence for RedisPersistence
         let conn = self.conn.as_mut().ok_or(mqtt::PersistenceError)?;
         let buf: Vec<u8> = buffers.concat();
         debug!("Putting key '{}' with {} bytes", key, buf.len());
-        redis::cmd("HSET").arg(&self.name).arg(key).arg(buf).execute(conn);
+        redis::cmd("HSET")
+            .arg(&self.name)
+            .arg(key)
+            .arg(buf)
+            .execute(conn);
         Ok(())
     }
 
@@ -172,8 +178,7 @@ impl mqtt::ClientPersistence for RedisPersistence
         if let Ok(v) = conn.hget(&self.name, key) as RedisResult<Vec<u8>> {
             debug!("Found key {} with {} bytes", key, v.len());
             Ok(v)
-        }
-        else {
+        } else {
             Err(mqtt::PersistenceError)
         }
     }
@@ -185,8 +190,7 @@ impl mqtt::ClientPersistence for RedisPersistence
         if let Ok(res) = conn.hdel(&self.name, key) as RedisResult<usize> {
             if res != 0 {
                 debug!("Removed key: {}", key);
-            }
-            else {
+            } else {
                 debug!("Key not found (assuming OK): {}", key);
             }
             // Either way, if key is not in the store we report success.
@@ -202,8 +206,7 @@ impl mqtt::ClientPersistence for RedisPersistence
         if let Ok(v) = conn.hkeys(&self.name) as RedisResult<Vec<String>> {
             debug!("Found keys: {:?}", v);
             Ok(v)
-        }
-        else {
+        } else {
             warn!("Error looking for keys");
             Err(mqtt::PersistenceError)
         }
@@ -231,8 +234,8 @@ impl mqtt::ClientPersistence for RedisPersistence
         if let Ok(res) = conn.hexists(&self.name, key) as RedisResult<usize> {
             debug!("'contains' query returned: {:?}", res);
             res != 0
+        } else {
+            false
         }
-        else { false }
     }
 }
-