nostr-rs-relay

commit 93dfed0a87cb02d8a75a8fe4e4f27e4f1bab6324
parent bef7ca7e27a2e83ec9df576d0f539e27354ebdec
Author: Greg Heartsfield <scsibug@imap.cc>
Date:   Sat, 24 Sep 2022 19:28:02 -0500

refactor: misc clippy suggestions

Diffstat:
M
src/db.rs
 | 
11
++++++-----
M
src/main.rs
 | 
6
+++---
M
src/server.rs
 | 
9
+++------

3 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/src/db.rs b/src/db.rs
@@ -62,13 +62,14 @@ pub fn build_pool(
             thread::sleep(Duration::from_millis(500));
         }
     }
-    let manager = match settings.database.in_memory {
-        true => SqliteConnectionManager::memory()
+    let manager = if settings.database.in_memory {
+        SqliteConnectionManager::memory()
             .with_flags(flags)
-            .with_init(|c| c.execute_batch(STARTUP_SQL)),
-        false => SqliteConnectionManager::file(&full_path)
+            .with_init(|c| c.execute_batch(STARTUP_SQL))
+    } else {
+        SqliteConnectionManager::file(&full_path)
             .with_flags(flags)
-            .with_init(|c| c.execute_batch(STARTUP_SQL)),
+            .with_init(|c| c.execute_batch(STARTUP_SQL))
     };
     let pool: SqlitePool = r2d2::Pool::builder()
         .test_on_check_out(true) // no noticeable performance hit
diff --git a/src/main.rs b/src/main.rs
@@ -10,7 +10,7 @@ use std::thread;
 use console_subscriber::ConsoleLayer;
 
 /// Return a requested DB name from command line arguments.
-fn db_from_args(args: Vec<String>) -> Option<String> {
+fn db_from_args(args: &[String]) -> Option<String> {
     if args.len() == 3 && args.get(1) == Some(&"--db".to_owned()) {
         return args.get(2).map(std::clone::Clone::clone);
     }
@@ -25,7 +25,7 @@ fn main() {
 
     // get database directory from args
     let args: Vec<String> = env::args().collect();
-    let db_dir: Option<String> = db_from_args(args);
+    let db_dir: Option<String> = db_from_args(&args);
     // configure settings from config.toml
     // replace default settings with those read from config.toml
     let mut settings = config::Settings::new();
@@ -44,7 +44,7 @@ fn main() {
     let handle = thread::spawn(|| {
         // we should have a 'control plane' channel to monitor and bump the server.
         // this will let us do stuff like clear the database, shutdown, etc.
-        let _ = start_server(settings, ctrl_rx);
+        let _svr = start_server(settings, ctrl_rx);
     });
     // block on nostr thread to finish.
     handle.join().unwrap();
diff --git a/src/server.rs b/src/server.rs
@@ -569,8 +569,7 @@ async fn nostr_server(
                     Ok(NostrMessage::CloseMsg(cc)) => {
                         // closing a request simply removes the subscription.
                         let parsed : Result<Close> = Result::<Close>::from(cc);
-                        match parsed {
-                            Ok(c) => {
+            if let Ok(c) = parsed {
                                 // check if a query is currently
                                 // running, and remove it if so.
                                 let stop_tx = running_queries.remove(&c.id);
@@ -580,12 +579,10 @@ async fn nostr_server(
                                 // stop checking new events against
                                 // the subscription
                                 conn.unsubscribe(&c);
-                            },
-                            Err(_) => {
+                            } else {
                                 info!("invalid command ignored");
                                 ws_stream.send(make_notice_message("could not parse command")).await.ok();
                             }
-                        }
                     },
                     Err(Error::ConnError) => {
                         debug!("got connection close/error, disconnecting client: {:?}",cid);
@@ -607,7 +604,7 @@ async fn nostr_server(
         }
     }
     // connection cleanup - ensure any still running queries are terminated.
-    for (_, stop_tx) in running_queries.into_iter() {
+    for (_, stop_tx) in running_queries {
         stop_tx.send(()).ok();
     }
     info!(