Update to Rust 1.59 and 2021 edition (#3038)

## Proposed Changes

Lots of lint updates related to `flat_map`, `unwrap_or_else` and string patterns. I did a little more creative refactoring in the op pool, but otherwise followed Clippy's suggestions.

## Additional Info

We need this PR to unblock CI.

common/account_utils/Cargo.toml

@@ -2,7 +2,7 @@
 name = "account_utils"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

common/clap_utils/Cargo.toml

@@ -2,7 +2,7 @@
 name = "clap_utils"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

common/clap_utils/src/lib.rs

@@ -31,7 +31,7 @@ pub fn get_eth2_network_config(cli_args: &ArgMatches) -> Result<Eth2NetworkConfi
 
     if let Some(string) = parse_optional::<String>(cli_args, "terminal-total-difficulty-override")?
     {
-        let stripped = string.replace(",", "");
+        let stripped = string.replace(',', "");
         let terminal_total_difficulty = Uint256::from_dec_str(&stripped).map_err(|e| {
             format!(
                 "Could not parse --terminal-total-difficulty-override as decimal value: {:?}",

common/compare_fields/Cargo.toml

@@ -2,7 +2,7 @@
 name = "compare_fields"
 version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2018"
+edition = "2021"
 
 [dev-dependencies]
 compare_fields_derive = { path = "../compare_fields_derive" }

common/compare_fields_derive/Cargo.toml

@@ -2,7 +2,7 @@
 name = "compare_fields_derive"
 version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 proc-macro = true

common/compare_fields_derive/src/lib.rs

@@ -8,7 +8,7 @@ use syn::{parse_macro_input, DeriveInput};
 fn is_slice(field: &syn::Field) -> bool {
     field.attrs.iter().any(|attr| {
         attr.path.is_ident("compare_fields")
-            && attr.tokens.to_string().replace(" ", "") == "(as_slice)"
+            && attr.tokens.to_string().replace(' ', "") == "(as_slice)"
     })
 }
 

common/deposit_contract/Cargo.toml

@@ -2,7 +2,7 @@
 name = "deposit_contract"
 version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2018"
+edition = "2021"
 
 build = "build.rs"
 

common/directory/Cargo.toml

@@ -2,7 +2,7 @@
 name = "directory"
 version = "0.1.0"
 authors = ["pawan <pawandhananjay@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

common/eth2/Cargo.toml

@@ -2,7 +2,7 @@
 name = "eth2"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

common/eth2_config/Cargo.toml

@@ -2,7 +2,7 @@
 name = "eth2_config"
 version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 types = { path = "../../consensus/types" }

common/eth2_interop_keypairs/Cargo.toml

@@ -2,7 +2,7 @@
 name = "eth2_interop_keypairs"
 version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

common/eth2_network_config/Cargo.toml

@@ -2,7 +2,7 @@
 name = "eth2_network_config"
 version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2018"
+edition = "2021"
 
 build = "build.rs"
 

common/eth2_wallet_manager/Cargo.toml

@@ -2,7 +2,7 @@
 name = "eth2_wallet_manager"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

common/fallback/Cargo.toml

@@ -2,7 +2,7 @@
 name = "fallback"
 version = "0.1.0"
 authors = ["blacktemplar <blacktemplar@a1.net>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

common/filesystem/Cargo.toml

@@ -2,7 +2,7 @@
 name = "filesystem"
 version = "0.1.0"
 authors = ["Mark Mackey <mark@sigmaprime.io>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

common/hashset_delay/Cargo.toml

@@ -2,7 +2,7 @@
 name = "hashset_delay"
 version = "0.2.0"
 authors = ["Sigma Prime <contact@sigmaprime.io>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 futures = "0.3.7"

common/lighthouse_metrics/Cargo.toml

@@ -2,7 +2,7 @@
 name = "lighthouse_metrics"
 version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

common/lighthouse_version/Cargo.toml

@@ -2,7 +2,7 @@
 name = "lighthouse_version"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

common/lockfile/Cargo.toml

@@ -2,7 +2,7 @@
 name = "lockfile"
 version = "0.1.0"
 authors = ["Michael Sproul <michael@sigmaprime.io>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 fs2 = "0.4.3"

common/logging/Cargo.toml

@@ -2,7 +2,7 @@
 name = "logging"
 version = "0.2.0"
 authors = ["blacktemplar <blacktemplar@a1.net>"]
-edition = "2018"
+edition = "2021"
 
 [features]
 test_logger = [] # Print log output to stderr when running tests instead of dropping it

common/logging/tests/test.rs

@@ -3,13 +3,11 @@ use std::process::Command;
 use std::process::Output;
 
 fn run_cmd(cmd_line: &str) -> Result<Output, std::io::Error> {
-    let output;
     if cfg!(target_os = "windows") {
-        output = Command::new(r#"cmd"#).args(["/C", cmd_line]).output();
+        Command::new(r#"cmd"#).args(["/C", cmd_line]).output()
     } else {
-        output = Command::new(r#"sh"#).args(["-c", cmd_line]).output();
+        Command::new(r#"sh"#).args(["-c", cmd_line]).output()
     }
-    output
 }
 
 #[test]

common/lru_cache/Cargo.toml

@@ -2,7 +2,7 @@
 name = "lru_cache"
 version = "0.1.0"
 authors = ["Sigma Prime <contact@sigmaprime.io>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 fnv = "1.0.7"

common/malloc_utils/Cargo.toml

@@ -2,7 +2,7 @@
 name = "malloc_utils"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

common/monitoring_api/Cargo.toml

@@ -2,7 +2,7 @@
 name = "monitoring_api"
 version = "0.1.0"
 authors = ["pawan <pawandhananjay@gmail.com>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

common/sensitive_url/Cargo.toml

@@ -2,7 +2,7 @@
 name = "sensitive_url"
 version = "0.1.0"
 authors = ["Mac L <mjladson@pm.me>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

common/slot_clock/Cargo.toml

@@ -2,7 +2,7 @@
 name = "slot_clock"
 version = "0.2.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 types = { path = "../../consensus/types" }

common/target_check/Cargo.toml

@@ -2,7 +2,7 @@
 name = "target_check"
 version = "0.1.0"
 authors = ["Michael Sproul <michael@sigmaprime.io>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 static_assertions = "1.1.0"

common/task_executor/Cargo.toml

@@ -2,7 +2,7 @@
 name = "task_executor"
 version = "0.1.0"
 authors = ["Sigma Prime <contact@sigmaprime.io>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 tokio = { version = "1.14.0", features = ["rt"] }

common/test_random_derive/Cargo.toml

@@ -2,7 +2,7 @@
 name = "test_random_derive"
 version = "0.2.0"
 authors = ["thojest <thojest@gmail.com>"]
-edition = "2018"
+edition = "2021"
 description = "Procedural derive macros for implementation of TestRandom trait"
 
 [lib]

common/test_random_derive/src/lib.rs

@@ -10,7 +10,7 @@ use syn::{parse_macro_input, DeriveInput};
 /// The field attribute is: `#[test_random(default)]`
 fn should_use_default(field: &syn::Field) -> bool {
     field.attrs.iter().any(|attr| {
-        attr.path.is_ident("test_random") && attr.tokens.to_string().replace(" ", "") == "(default)"
+        attr.path.is_ident("test_random") && attr.tokens.to_string().replace(' ', "") == "(default)"
     })
 }
 

common/validator_dir/Cargo.toml

@@ -2,7 +2,7 @@
 name = "validator_dir"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2018"
+edition = "2021"
 
 [features]
 insecure_keys = []

common/warp_utils/Cargo.toml

@@ -2,7 +2,7 @@
 name = "warp_utils"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html