refactor(rumqttc): clean-up examples (#794)

Co-authored-by: swanandx <[email protected]>

Author: Devdutt Shenoi

Cargo.lock

@@ -54,7 +54,24 @@ color-backtrace = "0.6"
 matches = "0.1"
 pretty_assertions = "1"
 pretty_env_logger = "0.5"
-rustls = "0.21"
-rustls-native-certs = "0.6"
 serde = { version = "1", features = ["derive"] }
-tokio = { version = "1", features = ["full", "macros"] }
+
+[[example]]
+name = "tls"
+path = "examples/tls.rs"
+required-features = ["use-rustls"]
+
+[[example]]
+name = "tls2"
+path = "examples/tls2.rs"
+required-features = ["use-rustls"]
+
+[[example]]
+name = "websocket"
+path = "examples/websocket.rs"
+required-features = ["websocket"]
+
+[[example]]
+name = "websocket_proxy"
+path = "examples/websocket_proxy.rs"
+required-features = ["websocket", "proxy"]

rumqttc/Cargo.toml

@@ -1,6 +1,6 @@
 use tokio::{task, time};
 
-use rumqttc::{self, AsyncClient, Event, EventLoop, Incoming, MqttOptions, QoS};
+use rumqttc::{AsyncClient, Event, EventLoop, Incoming, MqttOptions, QoS};
 use std::error::Error;
 use std::time::Duration;
 
@@ -14,7 +14,7 @@ fn create_conn() -> (AsyncClient, EventLoop) {
     AsyncClient::new(mqttoptions, 10)
 }
 
-#[tokio::main(worker_threads = 1)]
+#[tokio::main(flavor = "current_thread")]
 async fn main() -> Result<(), Box<dyn Error>> {
     pretty_env_logger::init();
 

rumqttc/examples/async_manual_acks.rs

@@ -1,4 +1,3 @@
-#![allow(dead_code, unused_imports)]
 use rumqttc::v5::mqttbytes::v5::Packet;
 use rumqttc::v5::mqttbytes::QoS;
 use tokio::{task, time};
@@ -17,7 +16,7 @@ fn create_conn() -> (AsyncClient, EventLoop) {
     AsyncClient::new(mqttoptions, 10)
 }
 
-#[tokio::main(worker_threads = 1)]
+#[tokio::main(flavor = "current_thread")]
 async fn main() -> Result<(), Box<dyn Error>> {
     // todo!("fix this example with new way of spawning clients")
     pretty_env_logger::init();

rumqttc/examples/async_manual_acks_v5.rs

@@ -1,10 +1,10 @@
 use tokio::{task, time};
 
-use rumqttc::{self, AsyncClient, MqttOptions, QoS};
+use rumqttc::{AsyncClient, MqttOptions, QoS};
 use std::error::Error;
 use std::time::Duration;
 
-#[tokio::main(worker_threads = 1)]
+#[tokio::main(flavor = "current_thread")]
 async fn main() -> Result<(), Box<dyn Error>> {
     pretty_env_logger::init();
     // color_backtrace::install();

rumqttc/examples/asyncpubsub.rs

@@ -5,7 +5,7 @@ use rumqttc::v5::{AsyncClient, MqttOptions};
 use std::error::Error;
 use std::time::Duration;
 
-#[tokio::main(worker_threads = 1)]
+#[tokio::main(flavor = "current_thread")]
 async fn main() -> Result<(), Box<dyn Error>> {
     pretty_env_logger::init();
     // color_backtrace::install();

rumqttc/examples/asyncpubsub_v5.rs

@@ -51,8 +51,8 @@ fn main() {
     });
 
     // Iterate to poll the eventloop for connection progress
-    for notification in connection.iter() {
-        if let Ok(Event::Incoming(Incoming::Publish(packet))) = notification {
+    for notification in connection.iter().flatten() {
+        if let Event::Incoming(Incoming::Publish(packet)) = notification {
             match Message::try_from(packet.payload.as_ref()) {
                 Ok(message) => println!("Payload = {message:?}"),
                 Err(error) => println!("Error = {error}"),

rumqttc/examples/serde.rs

@@ -6,7 +6,7 @@ use rumqttc::v5::{AsyncClient, MqttOptions};
 use std::error::Error;
 use std::time::Duration;
 
-#[tokio::main(worker_threads = 1)]
+#[tokio::main(flavor = "current_thread")]
 async fn main() -> Result<(), Box<dyn Error>> {
     pretty_env_logger::init();
 

rumqttc/examples/subscription_ids.rs

@@ -1,4 +1,4 @@
-use rumqttc::{self, Client, LastWill, MqttOptions, QoS};
+use rumqttc::{Client, LastWill, MqttOptions, QoS};
 use std::thread;
 use std::time::Duration;
 

rumqttc/examples/syncpubsub.rs

@@ -1,4 +1,4 @@
-use rumqttc::{self, Client, LastWill, MqttOptions, QoS};
+use rumqttc::{Client, LastWill, MqttOptions, QoS};
 use std::thread;
 use std::time::Duration;