Merge remote-tracking branch 'o/main' into feat/36

Author: sassman

Cargo.lock

@@ -21,16 +21,16 @@ maintenance = { status = "actively-developed" }
 [dependencies]
 anyhow = "1.0.56"
 tempfile = "3.3.0"
-rayon = "1.5.1"
-log = "0.4.14"
+rayon = "1.5.2"
+log = "0.4.16"
 env_logger = "0.9.0"
 simplerand = "1.3.0"
 humantime = "2.1.0"
 crossbeam-channel = "0.5"
 blockhash = "0.3"
 
 [dependencies.clap]
-version = "3.1.6"
+version = "3.1.9"
 features = ["cargo"]
 
 [dependencies.image]

Cargo.toml

@@ -256,9 +256,8 @@ pub fn ls_win() -> Result<()> {
     let api = setup()?;
     println!("Window | Id");
     for (window_owner, window_id) in api.window_list()? {
-        match (window_owner, window_id) {
-            (Some(window_owner), window_id) => println!("{} | {}", window_owner, window_id),
-            (_, _) => {}
+        if let (Some(window_owner), window_id) = (window_owner, window_id) {
+            println!("{} | {}", window_owner, window_id)
         }
     }