From 900d1e3143ed294fc05ea4641d6353cb3734c615 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EF=BD=88=EF=BD=89=EF=BD=8C=EF=BD=8A=EF=BD=95=EF=BD=93?=
 =?UTF-8?q?=EF=BD=94=EF=BD=89?= <hiljusti@so.dang.cool>
Date: Sun, 3 Jul 2022 00:30:44 -0700
Subject: [PATCH] Bump version to 3.4.2, misc minor updates

---
 Cargo.lock          |  2 +-
 Cargo.toml          |  2 +-
 README.md           |  2 +-
 sigi.1              |  2 +-
 src/cli.rs          | 18 ++++++++----------
 src/cli/interact.rs |  6 ++----
 6 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e1e2666..602685a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -668,7 +668,7 @@ dependencies = [
 
 [[package]]
 name = "sigi"
-version = "3.4.1"
+version = "3.4.2"
 dependencies = [
  "chrono",
  "clap",
diff --git a/Cargo.toml b/Cargo.toml
index b9b941d..bdbcae2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sigi"
-version = "3.4.1"
+version = "3.4.2"
 authors = ["J.R. Hill <hiljusti@so.dang.cool>"]
 edition = "2021"
 license = "GPL-2.0-only"
diff --git a/README.md b/README.md
index 5e45e2e..60faf8c 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ board games you want to play onto a stack. Shell aliases are encouraged to
 organize your various stacks.
 
 ```
-sigi 3.4.1
+sigi 3.4.2
 An organizing tool for terminal lovers who hate organizing
 
 USAGE:
diff --git a/sigi.1 b/sigi.1
index c3d22dd..8e3e562 100644
--- a/sigi.1
+++ b/sigi.1
@@ -1,4 +1,4 @@
-.TH sigi 1 "May 13, 2022" "version 3.4.1" "USER COMMANDS"
+.TH sigi 1 "July 3, 2022" "version 3.4.2" "USER COMMANDS"
 .\"
 .SH NAME
 sigi \- An organizing tool for terminal lovers who hate organizing
diff --git a/src/cli.rs b/src/cli.rs
index 9982f20..a2122c9 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -315,16 +315,14 @@ impl FormatConfig {
                 ProgrammaticFormat::JsonCompact => JsonCompact,
                 ProgrammaticFormat::Tsv => Tsv,
             })
-            .or_else(|| {
-                if verbose {
-                    Some(Human(Verbose))
-                } else if silent {
-                    Some(Silent)
-                } else if quiet {
-                    Some(Human(Quiet))
-                } else {
-                    None
-                }
+            .or(if verbose {
+                Some(Human(Verbose))
+            } else if silent {
+                Some(Silent)
+            } else if quiet {
+                Some(Human(Quiet))
+            } else {
+                None
             })
     }
 
diff --git a/src/cli/interact.rs b/src/cli/interact.rs
index b17d40d..173b48e 100644
--- a/src/cli/interact.rs
+++ b/src/cli/interact.rs
@@ -182,8 +182,7 @@ fn parse_effect(tokens: Vec<&str>, stack: String) -> ParseEffectResult {
     let parse_n = || {
         tokens
             .get(1)
-            .map(|s| usize::from_str(s).ok())
-            .flatten()
+            .and_then(|s| usize::from_str(s).ok())
             .unwrap_or(DEFAULT_SHORT_LIST_LIMIT)
     };
 
@@ -250,8 +249,7 @@ fn parse_effect(tokens: Vec<&str>, stack: String) -> ParseEffectResult {
     if PICK_TERMS.contains(term) {
         let indices = tokens
             .iter()
-            .map(|s| usize::from_str(s).ok())
-            .flatten()
+            .filter_map(|s| usize::from_str(s).ok())
             .collect();
         return Effect(Pick { stack, indices });
     }