Bump version to 3.4.2, misc minor updates

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sigi"
-version = "3.4.1"
+version = "3.4.2"
 authors = ["J.R. Hill <[email protected]>"]
 edition = "2021"
 license = "GPL-2.0-only"

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:

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

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
  })
  }
 

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 });
  }