Merge pull request #31 from film42/gt/stage123

Add a few style changes prior to release

examples/consumer-demo.rs

@@ -19,13 +19,9 @@ impl Worker<()> for HelloWorker {
 }
 
 #[derive(Clone)]
-struct PaymentReportWorker {}
+struct PaymentReportWorker;
 
 impl PaymentReportWorker {
-    fn new() -> Self {
-        Self {}
-    }
-
     async fn send_report(&self, user_guid: String) -> Result<()> {
         // TODO: Some actual work goes here...
         info!({"user_guid" = user_guid, "class_name" = Self::class_name()}, "Sending payment report to user");
@@ -50,13 +46,7 @@ impl Worker<PaymentReportArgs> for PaymentReportWorker {
     }
 }
 
-struct FilterExpiredUsersMiddleware {}
-
-impl FilterExpiredUsersMiddleware {
-    fn new() -> Self {
-        Self {}
-    }
-}
+struct FilterExpiredUsersMiddleware;
 
 #[derive(Deserialize)]
 struct FiltereExpiredUsersArgs {
@@ -190,10 +180,10 @@ async fn main() -> Result<()> {
 
     // Add known workers
     p.register(HelloWorker);
-    p.register(PaymentReportWorker::new());
+    p.register(PaymentReportWorker);
 
     // Custom Middlewares
-    p.using(FilterExpiredUsersMiddleware::new()).await;
+    p.using(FilterExpiredUsersMiddleware).await;
 
     //    // Reset cron jobs
     //    periodic::destroy_all(redis.clone()).await?;

examples/demo.rs

@@ -33,7 +33,7 @@ impl PaymentReportWorker {
     async fn send_report(&self, user_guid: String) -> Result<()> {
         // TODO: Some actual work goes here...
         info!({
-            "user_guid" = user_guid, 
+            "user_guid" = user_guid,
             "class_name" = Self::class_name()
         }, "Sending payment report to user");
 
@@ -69,13 +69,7 @@ impl Worker<PaymentReportArgs> for PaymentReportWorker {
     }
 }
 
-struct FilterExpiredUsersMiddleware {}
-
-impl FilterExpiredUsersMiddleware {
-    fn new() -> Self {
-        Self {}
-    }
-}
+struct FilterExpiredUsersMiddleware;
 
 #[derive(Deserialize)]
 struct FiltereExpiredUsersArgs {
@@ -106,7 +100,7 @@ impl ServerMiddleware for FilterExpiredUsersMiddleware {
                 error!({
                     "class" = &job.class,
                     "jid" = &job.jid,
-                    "user_guid" = filter.user_guid 
+                    "user_guid" = filter.user_guid
                 }, "Detected an expired user, skipping this job");
                 return Ok(());
             }
@@ -212,7 +206,7 @@ async fn main() -> Result<()> {
     p.register(PaymentReportWorker::new(redis.clone()));
 
     // Custom Middlewares
-    p.using(FilterExpiredUsersMiddleware::new()).await;
+    p.using(FilterExpiredUsersMiddleware).await;
 
     // Reset cron jobs
     periodic::destroy_all(redis.clone()).await?;

src/middleware.rs

@@ -65,7 +65,7 @@ impl Chain {
     pub(crate) fn new_with_stats(counter: Counter) -> Self {
         Self {
             stack: Arc::new(RwLock::new(vec![
-                Box::new(RetryMiddleware::new()),
+                Box::new(RetryMiddleware),
                 Box::new(StatsMiddleware::new(counter)),
                 Box::new(HandlerMiddleware),
             ])),
@@ -146,13 +146,7 @@ impl ServerMiddleware for HandlerMiddleware {
     }
 }
 
-struct RetryMiddleware {}
-
-impl RetryMiddleware {
-    fn new() -> Self {
-        Self {}
-    }
-}
+struct RetryMiddleware;
 
 #[async_trait]
 impl ServerMiddleware for RetryMiddleware {

tests/server_middleware_test.rs

@@ -85,7 +85,7 @@ mod test {
             did_process: Arc::new(Mutex::new(false)),
         };
         let queue = "random123".to_string();
-        let (mut p, mut redis) = new_base_processor(queue.clone()).await;
+        let (mut p, redis) = new_base_processor(queue.clone()).await;
 
         let middleware = TestMiddleware {
             should_halt: false,