diff --git a/account-decoder/Cargo.toml b/account-decoder/Cargo.toml
index 9588e1b706..fbd406ee07 100644
--- a/account-decoder/Cargo.toml
+++ b/account-decoder/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-account-decoder"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 base64 = "0.12.3"
diff --git a/accounts-bench/Cargo.toml b/accounts-bench/Cargo.toml
index bf56acb9e7..278fff8139 100644
--- a/accounts-bench/Cargo.toml
+++ b/accounts-bench/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
-edition = "2018"
+edition = "2021"
 name = "solana-accounts-bench"
 version = "1.9.0"
 repository = "https://github.com/solana-labs/solana"
diff --git a/accounts-cluster-bench/Cargo.toml b/accounts-cluster-bench/Cargo.toml
index 5a99aa2bb5..fb947c89d8 100644
--- a/accounts-cluster-bench/Cargo.toml
+++ b/accounts-cluster-bench/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
-edition = "2018"
+edition = "2021"
 name = "solana-accounts-cluster-bench"
 version = "1.9.0"
 repository = "https://github.com/solana-labs/solana"
diff --git a/accountsdb-plugin-interface/Cargo.toml b/accountsdb-plugin-interface/Cargo.toml
index a63f1e131e..12d7e38b19 100644
--- a/accountsdb-plugin-interface/Cargo.toml
+++ b/accountsdb-plugin-interface/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
-edition = "2018"
+edition = "2021"
 name = "solana-accountsdb-plugin-interface"
 description = "The Solana AccountsDb plugin interface."
 version = "1.9.0"
diff --git a/accountsdb-plugin-manager/Cargo.toml b/accountsdb-plugin-manager/Cargo.toml
index e459424c50..d645b0dc58 100644
--- a/accountsdb-plugin-manager/Cargo.toml
+++ b/accountsdb-plugin-manager/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
-edition = "2018"
+edition = "2021"
 name = "solana-accountsdb-plugin-manager"
 description = "The Solana AccountsDb plugin manager."
 version = "1.9.0"
diff --git a/accountsdb-plugin-postgres/Cargo.toml b/accountsdb-plugin-postgres/Cargo.toml
index 0fd71b6ef1..b5b7b2cd92 100644
--- a/accountsdb-plugin-postgres/Cargo.toml
+++ b/accountsdb-plugin-postgres/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
-edition = "2018"
+edition = "2021"
 name = "solana-accountsdb-plugin-postgres"
 description = "The Solana AccountsDb plugin for PostgreSQL database."
 version = "1.9.0"
diff --git a/banking-bench/Cargo.toml b/banking-bench/Cargo.toml
index 60ae241023..6bd6821837 100644
--- a/banking-bench/Cargo.toml
+++ b/banking-bench/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
-edition = "2018"
+edition = "2021"
 name = "solana-banking-bench"
 version = "1.9.0"
 repository = "https://github.com/solana-labs/solana"
diff --git a/banks-client/Cargo.toml b/banks-client/Cargo.toml
index ac527cafc7..3dfc7249f5 100644
--- a/banks-client/Cargo.toml
+++ b/banks-client/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-banks-client"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 borsh = "0.9.1"
diff --git a/banks-interface/Cargo.toml b/banks-interface/Cargo.toml
index 861da9b692..bb16fa2ea4 100644
--- a/banks-interface/Cargo.toml
+++ b/banks-interface/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-banks-interface"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 serde = { version = "1.0.130", features = ["derive"] }
diff --git a/banks-server/Cargo.toml b/banks-server/Cargo.toml
index 3cd4ffb407..070e79aa1b 100644
--- a/banks-server/Cargo.toml
+++ b/banks-server/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-banks-server"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 bincode = "1.3.3"
diff --git a/bench-streamer/Cargo.toml b/bench-streamer/Cargo.toml
index 15c56a78a8..af18cb8f32 100644
--- a/bench-streamer/Cargo.toml
+++ b/bench-streamer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
-edition = "2018"
+edition = "2021"
 name = "solana-bench-streamer"
 version = "1.9.0"
 repository = "https://github.com/solana-labs/solana"
diff --git a/bench-tps/Cargo.toml b/bench-tps/Cargo.toml
index d44d593cde..c215602872 100644
--- a/bench-tps/Cargo.toml
+++ b/bench-tps/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
-edition = "2018"
+edition = "2021"
 name = "solana-bench-tps"
 version = "1.9.0"
 repository = "https://github.com/solana-labs/solana"
diff --git a/bucket_map/Cargo.toml b/bucket_map/Cargo.toml
index a4eb9998ae..0dff3be4a3 100644
--- a/bucket_map/Cargo.toml
+++ b/bucket_map/Cargo.toml
@@ -8,7 +8,7 @@ readme = "../README.md"
 repository = "https://github.com/solana-labs/solana"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 rayon = "1.5.0"
diff --git a/clap-utils/Cargo.toml b/clap-utils/Cargo.toml
index 9ce4859732..564c05ffa0 100644
--- a/clap-utils/Cargo.toml
+++ b/clap-utils/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-clap-utils"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 clap = "2.33.0"
diff --git a/cli-config/Cargo.toml b/cli-config/Cargo.toml
index 44c05d63a7..f93f2263bd 100644
--- a/cli-config/Cargo.toml
+++ b/cli-config/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
-edition = "2018"
+edition = "2021"
 name = "solana-cli-config"
 description = "Blockchain, Rebuilt for Scale"
 version = "1.9.0"
diff --git a/cli-output/Cargo.toml b/cli-output/Cargo.toml
index a1ec7de3e2..143d2571f0 100644
--- a/cli-output/Cargo.toml
+++ b/cli-output/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
-edition = "2018"
+edition = "2021"
 name = "solana-cli-output"
 description = "Blockchain, Rebuilt for Scale"
 version = "1.9.0"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 51adcc2a2a..e369af30a1 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
-edition = "2018"
+edition = "2021"
 name = "solana-cli"
 description = "Blockchain, Rebuilt for Scale"
 version = "1.9.0"
diff --git a/client-test/Cargo.toml b/client-test/Cargo.toml
index b67c560672..5991b72b13 100644
--- a/client-test/Cargo.toml
+++ b/client-test/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-client-test"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 serde_json = "1.0.72"
diff --git a/client/Cargo.toml b/client/Cargo.toml
index ada2fa46d4..0a8a39a5ad 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-client"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 base64 = "0.13.0"
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 4d99c841d5..f7eb803f6f 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -8,7 +8,7 @@ readme = "../README.md"
 repository = "https://github.com/solana-labs/solana"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [badges]
 codecov = { repository = "solana-labs/solana", branch = "master", service = "github" }
diff --git a/crate-features/Cargo.toml b/crate-features/Cargo.toml
index f9c177c7a1..53801b91b7 100644
--- a/crate-features/Cargo.toml
+++ b/crate-features/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-crate-features"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 backtrace = { version = "0.3.33", features = ["serialize-serde"] }
diff --git a/dos/Cargo.toml b/dos/Cargo.toml
index 6e9a6fed1b..2c2ce69210 100644
--- a/dos/Cargo.toml
+++ b/dos/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
-edition = "2018"
+edition = "2021"
 name = "solana-dos"
 version = "1.9.0"
 repository = "https://github.com/solana-labs/solana"
diff --git a/download-utils/Cargo.toml b/download-utils/Cargo.toml
index d31ba7c2b7..2da187aef1 100644
--- a/download-utils/Cargo.toml
+++ b/download-utils/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-download-utils"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 console = "0.15.0"
diff --git a/entry/Cargo.toml b/entry/Cargo.toml
index d275d6e1c5..bf307e757d 100644
--- a/entry/Cargo.toml
+++ b/entry/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-poh"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 dlopen = "0.1.8"
diff --git a/faucet/Cargo.toml b/faucet/Cargo.toml
index 6321e528f5..0326c3ab08 100644
--- a/faucet/Cargo.toml
+++ b/faucet/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-faucet"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 bincode = "1.3.3"
diff --git a/frozen-abi/Cargo.toml b/frozen-abi/Cargo.toml
index bd05654d52..cedbcf71be 100644
--- a/frozen-abi/Cargo.toml
+++ b/frozen-abi/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-frozen-abi"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 bs58 = "0.4.0"
diff --git a/frozen-abi/macro/Cargo.toml b/frozen-abi/macro/Cargo.toml
index b0aa2e8d74..4bef26c869 100644
--- a/frozen-abi/macro/Cargo.toml
+++ b/frozen-abi/macro/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-frozen-abi-macro"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 proc-macro = true
diff --git a/genesis-utils/Cargo.toml b/genesis-utils/Cargo.toml
index 00fc207f5f..d432a73b86 100644
--- a/genesis-utils/Cargo.toml
+++ b/genesis-utils/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-download-utils"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 solana-sdk = { path = "../sdk", version = "=1.9.0" }
diff --git a/genesis/Cargo.toml b/genesis/Cargo.toml
index 1695506456..f2e7c36905 100644
--- a/genesis/Cargo.toml
+++ b/genesis/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
-edition = "2018"
+edition = "2021"
 name = "solana-genesis"
 description = "Blockchain, Rebuilt for Scale"
 version = "1.9.0"
diff --git a/gossip/Cargo.toml b/gossip/Cargo.toml
index e3d9c84ad7..dac61b7dd7 100644
--- a/gossip/Cargo.toml
+++ b/gossip/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
-edition = "2018"
+edition = "2021"
 name = "solana-gossip"
 description = "Blockchain, Rebuilt for Scale"
 version = "1.9.0"
diff --git a/install/Cargo.toml b/install/Cargo.toml
index a45b150d7c..5a3ae2f83c 100644
--- a/install/Cargo.toml
+++ b/install/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
-edition = "2018"
+edition = "2021"
 name = "solana-install"
 description = "The solana cluster software installer"
 version = "1.9.0"
diff --git a/keygen/Cargo.toml b/keygen/Cargo.toml
index c2d7042af6..1ab74f4fd8 100644
--- a/keygen/Cargo.toml
+++ b/keygen/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-keygen"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 bs58 = "0.4.0"
diff --git a/ledger-tool/Cargo.toml b/ledger-tool/Cargo.toml
index 221cefbad6..d8433f83c7 100644
--- a/ledger-tool/Cargo.toml
+++ b/ledger-tool/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
-edition = "2018"
+edition = "2021"
 name = "solana-ledger-tool"
 description = "Blockchain, Rebuilt for Scale"
 version = "1.9.0"
diff --git a/ledger/Cargo.toml b/ledger/Cargo.toml
index e502eb8e88..3d50b2c09f 100644
--- a/ledger/Cargo.toml
+++ b/ledger/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-ledger"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 bincode = "1.3.3"
diff --git a/local-cluster/Cargo.toml b/local-cluster/Cargo.toml
index 5ea89113f4..e2dfdaa4a5 100644
--- a/local-cluster/Cargo.toml
+++ b/local-cluster/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
-edition = "2018"
+edition = "2021"
 name = "solana-local-cluster"
 description = "Blockchain, Rebuilt for Scale"
 version = "1.9.0"
diff --git a/log-analyzer/Cargo.toml b/log-analyzer/Cargo.toml
index d843f46531..33f868fb0d 100644
--- a/log-analyzer/Cargo.toml
+++ b/log-analyzer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["Solana Maintainers <maintainers@solana.com>"]
-edition = "2018"
+edition = "2021"
 name = "solana-log-analyzer"
 description = "The solana cluster network analysis tool"
 version = "1.9.0"
diff --git a/logger/Cargo.toml b/logger/Cargo.toml
index 6e8836be61..5a5dfcfa22 100644
--- a/logger/Cargo.toml
+++ b/logger/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-logger"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 env_logger = "0.9.0"
diff --git a/measure/Cargo.toml b/measure/Cargo.toml
index fe9dd2d784..fd77b22c81 100644
--- a/measure/Cargo.toml
+++ b/measure/Cargo.toml
@@ -8,7 +8,7 @@ readme = "../README.md"
 repository = "https://github.com/solana-labs/solana"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 log = "0.4.14"
diff --git a/merkle-root-bench/Cargo.toml b/merkle-root-bench/Cargo.toml
index 148151cae4..8e9831c5e1 100644
--- a/merkle-root-bench/Cargo.toml
+++ b/merkle-root-bench/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
-edition = "2018"
+edition = "2021"
 name = "solana-merkle-root-bench"
 version = "1.9.0"
 repository = "https://github.com/solana-labs/solana"
diff --git a/merkle-tree/Cargo.toml b/merkle-tree/Cargo.toml
index 231222cd89..d93adb8e64 100644
--- a/merkle-tree/Cargo.toml
+++ b/merkle-tree/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-merkle-tree"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 solana-program = { path = "../sdk/program", version = "=1.9.0" }
diff --git a/metrics/Cargo.toml b/metrics/Cargo.toml
index a5bcc99cee..1684ac904f 100644
--- a/metrics/Cargo.toml
+++ b/metrics/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-metrics"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 env_logger = "0.9.0"
diff --git a/net-shaper/Cargo.toml b/net-shaper/Cargo.toml
index 82172fbf18..243d846d3f 100644
--- a/net-shaper/Cargo.toml
+++ b/net-shaper/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
-edition = "2018"
+edition = "2021"
 name = "solana-net-shaper"
 description = "The solana cluster network shaping tool"
 version = "1.9.0"
diff --git a/net-utils/Cargo.toml b/net-utils/Cargo.toml
index 2a1317e81b..5c2497a988 100644
--- a/net-utils/Cargo.toml
+++ b/net-utils/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-net-utils"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 bincode = "1.3.3"
diff --git a/notifier/Cargo.toml b/notifier/Cargo.toml
index 6500c17b46..3aabfbbc2d 100644
--- a/notifier/Cargo.toml
+++ b/notifier/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-notifier"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 log = "0.4.14"
diff --git a/perf/Cargo.toml b/perf/Cargo.toml
index c0a2194582..a1a2737adb 100644
--- a/perf/Cargo.toml
+++ b/perf/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-perf"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 bincode = "1.3.3"
diff --git a/perf/src/thread.rs b/perf/src/thread.rs
index 4f826ee6d5..e399929d00 100644
--- a/perf/src/thread.rs
+++ b/perf/src/thread.rs
@@ -1,8 +1,6 @@
 /// Wrapper for `nice(3)`.
 #[cfg(target_os = "linux")]
 fn nice(adjustment: i8) -> Result<i8, nix::errno::Errno> {
-    use std::convert::TryFrom;
-
     unsafe {
         *libc::__errno_location() = 0;
         let niceness = libc::nice(libc::c_int::from(adjustment));
@@ -71,6 +69,7 @@ pub fn is_renice_allowed(adjustment: i8) -> bool {
 
 #[cfg(test)]
 mod tests {
+    #[cfg(target_os = "linux")]
     use super::*;
 
     #[cfg(target_os = "linux")]
diff --git a/poh-bench/Cargo.toml b/poh-bench/Cargo.toml
index 70f025e0a3..d11e760b59 100644
--- a/poh-bench/Cargo.toml
+++ b/poh-bench/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
-edition = "2018"
+edition = "2021"
 name = "solana-poh-bench"
 version = "1.9.0"
 repository = "https://github.com/solana-labs/solana"
diff --git a/poh/Cargo.toml b/poh/Cargo.toml
index 4631d4fffb..a3fd44a71e 100644
--- a/poh/Cargo.toml
+++ b/poh/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-poh"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 core_affinity = "0.5.10"
diff --git a/program-runtime/Cargo.toml b/program-runtime/Cargo.toml
index 0798e60c1a..d84f158f38 100644
--- a/program-runtime/Cargo.toml
+++ b/program-runtime/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-program-runtime"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 base64 = "0.13"
diff --git a/program-test/Cargo.toml b/program-test/Cargo.toml
index fa022778ea..19e667332d 100644
--- a/program-test/Cargo.toml
+++ b/program-test/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 description = "Solana Program Test Framework"
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 name = "solana-program-test"
 repository = "https://github.com/solana-labs/solana"
diff --git a/programs/bpf/Cargo.toml b/programs/bpf/Cargo.toml
index c06a0d3e8a..60d56a8695 100644
--- a/programs/bpf/Cargo.toml
+++ b/programs/bpf/Cargo.toml
@@ -8,7 +8,7 @@ readme = "README.md"
 repository = "https://github.com/solana-labs/solana"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [features]
diff --git a/programs/bpf/rust/128bit/Cargo.toml b/programs/bpf/rust/128bit/Cargo.toml
index 0745dba4bc..57bda245cb 100644
--- a/programs/bpf/rust/128bit/Cargo.toml
+++ b/programs/bpf/rust/128bit/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-128bit"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 solana-program = { path = "../../../../sdk/program", version = "=1.9.0" }
diff --git a/programs/bpf/rust/128bit_dep/Cargo.toml b/programs/bpf/rust/128bit_dep/Cargo.toml
index 0635621c5f..a9f79dfc1a 100644
--- a/programs/bpf/rust/128bit_dep/Cargo.toml
+++ b/programs/bpf/rust/128bit_dep/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-128bit-dep"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 solana-program = { path = "../../../../sdk/program", version = "=1.9.0" }
diff --git a/programs/bpf/rust/alloc/Cargo.toml b/programs/bpf/rust/alloc/Cargo.toml
index 589b3a7bea..43a9b42b5d 100644
--- a/programs/bpf/rust/alloc/Cargo.toml
+++ b/programs/bpf/rust/alloc/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-alloc"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 solana-program = { path = "../../../../sdk/program", version = "=1.9.0" }
diff --git a/programs/bpf/rust/call_depth/Cargo.toml b/programs/bpf/rust/call_depth/Cargo.toml
index cc4e484bab..4dcd41a3ec 100644
--- a/programs/bpf/rust/call_depth/Cargo.toml
+++ b/programs/bpf/rust/call_depth/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-call-depth"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 solana-program = { path = "../../../../sdk/program", version = "=1.9.0" }
diff --git a/programs/bpf/rust/caller_access/Cargo.toml b/programs/bpf/rust/caller_access/Cargo.toml
index 8ec4111400..343d329ca0 100644
--- a/programs/bpf/rust/caller_access/Cargo.toml
+++ b/programs/bpf/rust/caller_access/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-caller-access"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 solana-program = { path = "../../../../sdk/program", version = "=1.9.0" }
diff --git a/programs/bpf/rust/custom_heap/Cargo.toml b/programs/bpf/rust/custom_heap/Cargo.toml
index fbdf5ff4b6..259b45101a 100644
--- a/programs/bpf/rust/custom_heap/Cargo.toml
+++ b/programs/bpf/rust/custom_heap/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-custom-heap"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 solana-program = { path = "../../../../sdk/program", version = "=1.9.0" }
diff --git a/programs/bpf/rust/dep_crate/Cargo.toml b/programs/bpf/rust/dep_crate/Cargo.toml
index 19a5dae6bb..e0a673a98d 100644
--- a/programs/bpf/rust/dep_crate/Cargo.toml
+++ b/programs/bpf/rust/dep_crate/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-dep-crate"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 byteorder = { version = "1", default-features = false }
diff --git a/programs/bpf/rust/deprecated_loader/Cargo.toml b/programs/bpf/rust/deprecated_loader/Cargo.toml
index c220f52513..4cbd1c3e0f 100644
--- a/programs/bpf/rust/deprecated_loader/Cargo.toml
+++ b/programs/bpf/rust/deprecated_loader/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-deprecated-loader"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 solana-program = { path = "../../../../sdk/program", version = "=1.9.0" }
diff --git a/programs/bpf/rust/dup_accounts/Cargo.toml b/programs/bpf/rust/dup_accounts/Cargo.toml
index e3e50a5861..1982b8e70e 100644
--- a/programs/bpf/rust/dup_accounts/Cargo.toml
+++ b/programs/bpf/rust/dup_accounts/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-dup-accounts"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 solana-program = { path = "../../../../sdk/program", version = "=1.9.0" }
diff --git a/programs/bpf/rust/error_handling/Cargo.toml b/programs/bpf/rust/error_handling/Cargo.toml
index 500542411f..fd8317a08f 100644
--- a/programs/bpf/rust/error_handling/Cargo.toml
+++ b/programs/bpf/rust/error_handling/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-error-handling"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 num-derive = "0.3"
diff --git a/programs/bpf/rust/external_spend/Cargo.toml b/programs/bpf/rust/external_spend/Cargo.toml
index 92374eaec7..09e959ee86 100644
--- a/programs/bpf/rust/external_spend/Cargo.toml
+++ b/programs/bpf/rust/external_spend/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-external-spend"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 solana-program = { path = "../../../../sdk/program", version = "=1.9.0" }
diff --git a/programs/bpf/rust/finalize/Cargo.toml b/programs/bpf/rust/finalize/Cargo.toml
index 85cd5ed97e..6440dc9c44 100644
--- a/programs/bpf/rust/finalize/Cargo.toml
+++ b/programs/bpf/rust/finalize/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-finalize"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 solana-program = { path = "../../../../sdk/program", version = "=1.9.0" }
diff --git a/programs/bpf/rust/instruction_introspection/Cargo.toml b/programs/bpf/rust/instruction_introspection/Cargo.toml
index c16eb6fde4..b74502eec1 100644
--- a/programs/bpf/rust/instruction_introspection/Cargo.toml
+++ b/programs/bpf/rust/instruction_introspection/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-instruction-introspection"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 solana-program = { path = "../../../../sdk/program", version = "=1.9.0" }
diff --git a/programs/bpf/rust/invoke/Cargo.toml b/programs/bpf/rust/invoke/Cargo.toml
index a1f60c7a4f..06532a8463 100644
--- a/programs/bpf/rust/invoke/Cargo.toml
+++ b/programs/bpf/rust/invoke/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-invoke"
-edition = "2018"
+edition = "2021"
 
 [features]
 default = ["program"]
diff --git a/programs/bpf/rust/invoke_and_error/Cargo.toml b/programs/bpf/rust/invoke_and_error/Cargo.toml
index 08d3e80088..98fba8d2de 100644
--- a/programs/bpf/rust/invoke_and_error/Cargo.toml
+++ b/programs/bpf/rust/invoke_and_error/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-invoke-and-error"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 solana-program = { path = "../../../../sdk/program", version = "=1.9.0" }
diff --git a/programs/bpf/rust/invoke_and_ok/Cargo.toml b/programs/bpf/rust/invoke_and_ok/Cargo.toml
index 8b7f70e4ce..a42a30fbe9 100644
--- a/programs/bpf/rust/invoke_and_ok/Cargo.toml
+++ b/programs/bpf/rust/invoke_and_ok/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-invoke-and-ok"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 solana-program = { path = "../../../../sdk/program", version = "=1.9.0" }
diff --git a/programs/bpf/rust/invoke_and_return/Cargo.toml b/programs/bpf/rust/invoke_and_return/Cargo.toml
index dd19e93d30..1d576d7ae6 100644
--- a/programs/bpf/rust/invoke_and_return/Cargo.toml
+++ b/programs/bpf/rust/invoke_and_return/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-invoke-and-return"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 solana-program = { path = "../../../../sdk/program", version = "=1.9.0" }
diff --git a/programs/bpf/rust/invoked/Cargo.toml b/programs/bpf/rust/invoked/Cargo.toml
index fbff06cb23..54c27a67d8 100644
--- a/programs/bpf/rust/invoked/Cargo.toml
+++ b/programs/bpf/rust/invoked/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-invoked"
-edition = "2018"
+edition = "2021"
 
 [features]
 default = ["program"]
diff --git a/programs/bpf/rust/iter/Cargo.toml b/programs/bpf/rust/iter/Cargo.toml
index a0cdeaa2c9..e516883320 100644
--- a/programs/bpf/rust/iter/Cargo.toml
+++ b/programs/bpf/rust/iter/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-iter"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 solana-program = { path = "../../../../sdk/program", version = "=1.9.0" }
diff --git a/programs/bpf/rust/log_data/Cargo.toml b/programs/bpf/rust/log_data/Cargo.toml
index 8d31ad2db5..c3f96a1fba 100644
--- a/programs/bpf/rust/log_data/Cargo.toml
+++ b/programs/bpf/rust/log_data/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-log-data"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 solana-program = { path = "../../../../sdk/program", version = "=1.9.0" }
diff --git a/programs/bpf/rust/many_args/Cargo.toml b/programs/bpf/rust/many_args/Cargo.toml
index e857aad72f..f548c44696 100644
--- a/programs/bpf/rust/many_args/Cargo.toml
+++ b/programs/bpf/rust/many_args/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-many-args"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 solana-program = { path = "../../../../sdk/program", version = "=1.9.0" }
diff --git a/programs/bpf/rust/many_args_dep/Cargo.toml b/programs/bpf/rust/many_args_dep/Cargo.toml
index 0e46ba1326..4a2ea5a431 100644
--- a/programs/bpf/rust/many_args_dep/Cargo.toml
+++ b/programs/bpf/rust/many_args_dep/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-many-args-dep"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 solana-program = { path = "../../../../sdk/program", version = "=1.9.0" }
diff --git a/programs/bpf/rust/mem/Cargo.toml b/programs/bpf/rust/mem/Cargo.toml
index 9c73e09e3a..6319244248 100644
--- a/programs/bpf/rust/mem/Cargo.toml
+++ b/programs/bpf/rust/mem/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-mem"
-edition = "2018"
+edition = "2021"
 
 [features]
 no-entrypoint = []
diff --git a/programs/bpf/rust/membuiltins/Cargo.toml b/programs/bpf/rust/membuiltins/Cargo.toml
index 817f2f2ecb..c45ad21228 100644
--- a/programs/bpf/rust/membuiltins/Cargo.toml
+++ b/programs/bpf/rust/membuiltins/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-mem"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 solana-bpf-rust-mem = { path = "../mem", version = "=1.9.0", features = [ "no-entrypoint" ] }
diff --git a/programs/bpf/rust/noop/Cargo.toml b/programs/bpf/rust/noop/Cargo.toml
index 456751c45b..bf34291b97 100644
--- a/programs/bpf/rust/noop/Cargo.toml
+++ b/programs/bpf/rust/noop/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-noop"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 solana-program = { path = "../../../../sdk/program", version = "=1.9.0" }
diff --git a/programs/bpf/rust/panic/Cargo.toml b/programs/bpf/rust/panic/Cargo.toml
index 0f593fa3f2..cddbc2080a 100644
--- a/programs/bpf/rust/panic/Cargo.toml
+++ b/programs/bpf/rust/panic/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-panic"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 solana-program = { path = "../../../../sdk/program", version = "=1.9.0" }
diff --git a/programs/bpf/rust/param_passing/Cargo.toml b/programs/bpf/rust/param_passing/Cargo.toml
index 647404e1cb..3fccdefd31 100644
--- a/programs/bpf/rust/param_passing/Cargo.toml
+++ b/programs/bpf/rust/param_passing/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-param-passing"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 solana-program = { path = "../../../../sdk/program", version = "=1.9.0" }
diff --git a/programs/bpf/rust/param_passing_dep/Cargo.toml b/programs/bpf/rust/param_passing_dep/Cargo.toml
index 71d222d43b..2cb1bd9142 100644
--- a/programs/bpf/rust/param_passing_dep/Cargo.toml
+++ b/programs/bpf/rust/param_passing_dep/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-param-passing-dep"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 solana-program = { path = "../../../../sdk/program", version = "=1.9.0" }
diff --git a/programs/bpf/rust/rand/Cargo.toml b/programs/bpf/rust/rand/Cargo.toml
index 96de18a5c7..846dcea25c 100644
--- a/programs/bpf/rust/rand/Cargo.toml
+++ b/programs/bpf/rust/rand/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-rand"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 getrandom = { version = "0.1.14", features = ["dummy"] }
diff --git a/programs/bpf/rust/realloc/Cargo.toml b/programs/bpf/rust/realloc/Cargo.toml
index 0a387d2b9b..6c21391b85 100644
--- a/programs/bpf/rust/realloc/Cargo.toml
+++ b/programs/bpf/rust/realloc/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-realloc"
-edition = "2018"
+edition = "2021"
 
 [features]
 default = ["program"]
diff --git a/programs/bpf/rust/realloc_invoke/Cargo.toml b/programs/bpf/rust/realloc_invoke/Cargo.toml
index b534861486..3cedef126c 100644
--- a/programs/bpf/rust/realloc_invoke/Cargo.toml
+++ b/programs/bpf/rust/realloc_invoke/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-realloc-invoke"
-edition = "2018"
+edition = "2021"
 
 [features]
 default = ["program"]
diff --git a/programs/bpf/rust/ro_account_modify/Cargo.toml b/programs/bpf/rust/ro_account_modify/Cargo.toml
index 9c915709e6..b512d7f917 100644
--- a/programs/bpf/rust/ro_account_modify/Cargo.toml
+++ b/programs/bpf/rust/ro_account_modify/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-ro-modify"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 solana-program = { path = "../../../../sdk/program", version = "=1.9.0" }
diff --git a/programs/bpf/rust/ro_modify/Cargo.toml b/programs/bpf/rust/ro_modify/Cargo.toml
index d4ed928c7b..31d3c807e9 100644
--- a/programs/bpf/rust/ro_modify/Cargo.toml
+++ b/programs/bpf/rust/ro_modify/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-ro-modify"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 solana-program = { path = "../../../../sdk/program", version = "=1.9.0" }
diff --git a/programs/bpf/rust/sanity/Cargo.toml b/programs/bpf/rust/sanity/Cargo.toml
index c008be80b1..3ed7cb3a04 100644
--- a/programs/bpf/rust/sanity/Cargo.toml
+++ b/programs/bpf/rust/sanity/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-sanity"
-edition = "2018"
+edition = "2021"
 
 [features]
 test-bpf = []
diff --git a/programs/bpf/rust/secp256k1_recover/Cargo.toml b/programs/bpf/rust/secp256k1_recover/Cargo.toml
index 82b867cc0c..b837039ddb 100644
--- a/programs/bpf/rust/secp256k1_recover/Cargo.toml
+++ b/programs/bpf/rust/secp256k1_recover/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-secp256k1-recover"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 solana-program = { path = "../../../../sdk/program", version = "=1.9.0" }
diff --git a/programs/bpf/rust/sha/Cargo.toml b/programs/bpf/rust/sha/Cargo.toml
index e7822652df..6c4b946162 100644
--- a/programs/bpf/rust/sha/Cargo.toml
+++ b/programs/bpf/rust/sha/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-sha"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 blake3 = "1.0.0"
diff --git a/programs/bpf/rust/spoof1/Cargo.toml b/programs/bpf/rust/spoof1/Cargo.toml
index c33e39da6c..31daadfdef 100644
--- a/programs/bpf/rust/spoof1/Cargo.toml
+++ b/programs/bpf/rust/spoof1/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-spoof1"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 solana-program = { path = "../../../../sdk/program", version = "=1.9.0" }
diff --git a/programs/bpf/rust/spoof1_system/Cargo.toml b/programs/bpf/rust/spoof1_system/Cargo.toml
index 5a8b15c326..f5124d54e0 100644
--- a/programs/bpf/rust/spoof1_system/Cargo.toml
+++ b/programs/bpf/rust/spoof1_system/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-spoof1-system"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 solana-program = { path = "../../../../sdk/program", version = "=1.9.0" }
diff --git a/programs/bpf/rust/sysvar/Cargo.toml b/programs/bpf/rust/sysvar/Cargo.toml
index 8b18e2fcc4..925b73689a 100644
--- a/programs/bpf/rust/sysvar/Cargo.toml
+++ b/programs/bpf/rust/sysvar/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-sysvar"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 solana-program = { path = "../../../../sdk/program", version = "=1.9.0" }
diff --git a/programs/bpf/rust/upgradeable/Cargo.toml b/programs/bpf/rust/upgradeable/Cargo.toml
index c1734bf884..0e896b59b0 100644
--- a/programs/bpf/rust/upgradeable/Cargo.toml
+++ b/programs/bpf/rust/upgradeable/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-upgradeable"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 solana-program = { path = "../../../../sdk/program", version = "=1.9.0" }
diff --git a/programs/bpf/rust/upgraded/Cargo.toml b/programs/bpf/rust/upgraded/Cargo.toml
index eaf038ec49..c84bbae952 100644
--- a/programs/bpf/rust/upgraded/Cargo.toml
+++ b/programs/bpf/rust/upgraded/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-rust-upgraded"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 solana-program = { path = "../../../../sdk/program", version = "=1.9.0" }
diff --git a/programs/bpf_loader/Cargo.toml b/programs/bpf_loader/Cargo.toml
index 9c9a3ddee6..6b2ad4ed41 100644
--- a/programs/bpf_loader/Cargo.toml
+++ b/programs/bpf_loader/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-bpf-loader-program"
-edition = "2018"
+edition = "2021"
 
 [build-dependencies]
 regex = "1.5.4"
diff --git a/programs/compute-budget/Cargo.toml b/programs/compute-budget/Cargo.toml
index 744ae7cd4d..3f2a14b046 100644
--- a/programs/compute-budget/Cargo.toml
+++ b/programs/compute-budget/Cargo.toml
@@ -7,7 +7,7 @@ documentation = "https://docs.rs/solana-compute-budget-program"
 repository = "https://github.com/solana-labs/solana"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 solana-program-runtime = { path = "../../program-runtime", version = "=1.9.0" }
diff --git a/programs/config/Cargo.toml b/programs/config/Cargo.toml
index 27bdb4c076..547d8cc998 100644
--- a/programs/config/Cargo.toml
+++ b/programs/config/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-config-program"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 bincode = "1.3.3"
diff --git a/programs/stake/Cargo.toml b/programs/stake/Cargo.toml
index 4282365a17..b7a691a0da 100644
--- a/programs/stake/Cargo.toml
+++ b/programs/stake/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-stake-program"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 bincode = "1.3.3"
diff --git a/programs/vote/Cargo.toml b/programs/vote/Cargo.toml
index ed36542dac..bf4dc3f3bf 100644
--- a/programs/vote/Cargo.toml
+++ b/programs/vote/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-vote-program"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 bincode = "1.3.3"
diff --git a/rayon-threadlimit/Cargo.toml b/rayon-threadlimit/Cargo.toml
index d23e0be74d..7bc05cf140 100644
--- a/rayon-threadlimit/Cargo.toml
+++ b/rayon-threadlimit/Cargo.toml
@@ -8,7 +8,7 @@ readme = "../README.md"
 repository = "https://github.com/solana-labs/solana"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 num_cpus = "1.13.0"
diff --git a/rbpf-cli/Cargo.toml b/rbpf-cli/Cargo.toml
index a693cdf754..31d3484f41 100644
--- a/rbpf-cli/Cargo.toml
+++ b/rbpf-cli/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/rbpf"
 homepage = "https://solana.com/"
 keywords = ["BPF", "eBPF", "interpreter", "JIT"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 clap = "3.0.0-beta.2"
diff --git a/remote-wallet/Cargo.toml b/remote-wallet/Cargo.toml
index c03d5be9dc..aed3fbfd03 100644
--- a/remote-wallet/Cargo.toml
+++ b/remote-wallet/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
-edition = "2018"
+edition = "2021"
 name = "solana-remote-wallet"
 description = "Blockchain, Rebuilt for Scale"
 version = "1.9.0"
diff --git a/replica-lib/Cargo.toml b/replica-lib/Cargo.toml
index ac89f37e8e..f2ef2dbe91 100644
--- a/replica-lib/Cargo.toml
+++ b/replica-lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
-edition = "2018"
+edition = "2021"
 name = "solana-replica-lib"
 description = "The library used for replication by both the client and server"
 version = "1.9.0"
diff --git a/replica-node/Cargo.toml b/replica-node/Cargo.toml
index d96dc72dfe..291a00b736 100644
--- a/replica-node/Cargo.toml
+++ b/replica-node/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
-edition = "2018"
+edition = "2021"
 name = "solana-replica-node"
 description = "Solana replication node"
 version = "1.9.0"
diff --git a/rpc-test/Cargo.toml b/rpc-test/Cargo.toml
index 5c2c281076..7955dc7daf 100644
--- a/rpc-test/Cargo.toml
+++ b/rpc-test/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-rpc-test"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 bincode = "1.3.3"
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
index 49ee4116ba..26d2e9ab58 100644
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-rpc"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 base64 = "0.12.3"
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
index a32368a002..8a1260fff8 100644
--- a/runtime/Cargo.toml
+++ b/runtime/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-runtime"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 arrayref = "0.3.6"
diff --git a/runtime/store-tool/Cargo.toml b/runtime/store-tool/Cargo.toml
index 6c6bcf35a4..44ae18ea6c 100644
--- a/runtime/store-tool/Cargo.toml
+++ b/runtime/store-tool/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
-edition = "2018"
+edition = "2021"
 name = "solana-store-tool"
 description = "Tool to inspect append vecs"
 version = "1.9.0"
diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml
index e553a02181..832528a874 100644
--- a/sdk/Cargo.toml
+++ b/sdk/Cargo.toml
@@ -8,7 +8,7 @@ homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-sdk"
 readme = "README.md"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [features]
 # "program" feature is a legacy feature retained to support v1.3 and older
diff --git a/sdk/cargo-build-bpf/Cargo.toml b/sdk/cargo-build-bpf/Cargo.toml
index 10e42a51cb..8901e09ff4 100644
--- a/sdk/cargo-build-bpf/Cargo.toml
+++ b/sdk/cargo-build-bpf/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
 homepage = "https://solana.com/"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/sdk/cargo-build-bpf/tests/crates/fail/Cargo.toml b/sdk/cargo-build-bpf/tests/crates/fail/Cargo.toml
index 98f8c9b448..57babe99c0 100644
--- a/sdk/cargo-build-bpf/tests/crates/fail/Cargo.toml
+++ b/sdk/cargo-build-bpf/tests/crates/fail/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/sdk/cargo-build-bpf/tests/crates/noop/Cargo.toml b/sdk/cargo-build-bpf/tests/crates/noop/Cargo.toml
index 236e6ea10e..b9741b2d4e 100644
--- a/sdk/cargo-build-bpf/tests/crates/noop/Cargo.toml
+++ b/sdk/cargo-build-bpf/tests/crates/noop/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/sdk/cargo-test-bpf/Cargo.toml b/sdk/cargo-test-bpf/Cargo.toml
index d6d2961129..9af42cff73 100644
--- a/sdk/cargo-test-bpf/Cargo.toml
+++ b/sdk/cargo-test-bpf/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
 homepage = "https://solana.com/"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/sdk/macro/Cargo.toml b/sdk/macro/Cargo.toml
index 4fb9a9ee67..e9d89f46f6 100644
--- a/sdk/macro/Cargo.toml
+++ b/sdk/macro/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-sdk-macro"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 proc-macro = true
diff --git a/sdk/program/Cargo.toml b/sdk/program/Cargo.toml
index 991e12c50b..3b9e984249 100644
--- a/sdk/program/Cargo.toml
+++ b/sdk/program/Cargo.toml
@@ -8,7 +8,7 @@ homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-program"
 readme = "README.md"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 bincode = "1.3.1"
diff --git a/sdk/program/src/message/versions.rs b/sdk/program/src/message/versions.rs
index 34eacbb79d..d31b313e2e 100644
--- a/sdk/program/src/message/versions.rs
+++ b/sdk/program/src/message/versions.rs
@@ -89,7 +89,6 @@ impl VersionedMessage {
     /// Compute the blake3 hash of a raw transaction message
     pub fn hash_raw_message(message_bytes: &[u8]) -> Hash {
         use blake3::traits::digest::Digest;
-        use std::convert::TryFrom;
         let mut hasher = blake3::Hasher::new();
         hasher.update(b"solana-tx-message-v1");
         hasher.update(message_bytes);
diff --git a/send-transaction-service/Cargo.toml b/send-transaction-service/Cargo.toml
index 75762dae9e..cc98944974 100644
--- a/send-transaction-service/Cargo.toml
+++ b/send-transaction-service/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-send-transaction-service"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 log = "0.4.14"
diff --git a/stake-accounts/Cargo.toml b/stake-accounts/Cargo.toml
index e8776b5270..4c5824f2da 100644
--- a/stake-accounts/Cargo.toml
+++ b/stake-accounts/Cargo.toml
@@ -2,7 +2,7 @@
 name = "solana-stake-accounts"
 description = "Blockchain, Rebuilt for Scale"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
-edition = "2018"
+edition = "2021"
 version = "1.9.0"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
diff --git a/storage-bigtable/Cargo.toml b/storage-bigtable/Cargo.toml
index da730f60c3..424743fa98 100644
--- a/storage-bigtable/Cargo.toml
+++ b/storage-bigtable/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-storage-bigtable"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 backoff = { version = "0.3.0", features = ["tokio"] }
diff --git a/storage-bigtable/build-proto/Cargo.toml b/storage-bigtable/build-proto/Cargo.toml
index 1ed6f45456..474b5c26d8 100644
--- a/storage-bigtable/build-proto/Cargo.toml
+++ b/storage-bigtable/build-proto/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 authors = ["Solana Maintainers <maintainers@solana.com>"]
 description = "Blockchain, Rebuilt for Scale"
-edition = "2018"
+edition = "2021"
 homepage = "https://solana.com/"
 license = "Apache-2.0"
 name = "proto"
diff --git a/storage-proto/Cargo.toml b/storage-proto/Cargo.toml
index a4ba207bff..b13a2ad351 100644
--- a/storage-proto/Cargo.toml
+++ b/storage-proto/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-storage-proto"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 bincode = "1.3.3"
diff --git a/streamer/Cargo.toml b/streamer/Cargo.toml
index 991cc57084..ac6e9af1af 100644
--- a/streamer/Cargo.toml
+++ b/streamer/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-streamer"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 itertools = "0.10.1"
diff --git a/sys-tuner/Cargo.toml b/sys-tuner/Cargo.toml
index 99ced249f5..9478932421 100644
--- a/sys-tuner/Cargo.toml
+++ b/sys-tuner/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
-edition = "2018"
+edition = "2021"
 name = "solana-sys-tuner"
 description = "The solana cluster system tuner daemon"
 version = "1.9.0"
diff --git a/test-validator/Cargo.toml b/test-validator/Cargo.toml
index 401c7c760f..7dfc9a5a4a 100644
--- a/test-validator/Cargo.toml
+++ b/test-validator/Cargo.toml
@@ -8,7 +8,7 @@ readme = "../README.md"
 repository = "https://github.com/solana-labs/solana"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 base64 = "0.12.3"
diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml
index 956e364b2e..790aa3f095 100644
--- a/tokens/Cargo.toml
+++ b/tokens/Cargo.toml
@@ -2,7 +2,7 @@
 name = "solana-tokens"
 description = "Blockchain, Rebuilt for Scale"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
-edition = "2018"
+edition = "2021"
 version = "1.9.0"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
diff --git a/transaction-dos/Cargo.toml b/transaction-dos/Cargo.toml
index 9d5649b259..52b6ca926f 100644
--- a/transaction-dos/Cargo.toml
+++ b/transaction-dos/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
-edition = "2018"
+edition = "2021"
 name = "solana-transaction-dos"
 version = "1.9.0"
 repository = "https://github.com/solana-labs/solana"
diff --git a/transaction-status/Cargo.toml b/transaction-status/Cargo.toml
index 99bacdfa9c..3512149f86 100644
--- a/transaction-status/Cargo.toml
+++ b/transaction-status/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-transaction-status"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 base64 = "0.12.3"
diff --git a/upload-perf/Cargo.toml b/upload-perf/Cargo.toml
index f80f5d8ac1..a5c3d65360 100644
--- a/upload-perf/Cargo.toml
+++ b/upload-perf/Cargo.toml
@@ -5,7 +5,7 @@ description = "Metrics Upload Utility"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 homepage = "https://solana.com/"
 publish = false
 
diff --git a/validator/Cargo.toml b/validator/Cargo.toml
index 5674602cba..e842ce5ad8 100644
--- a/validator/Cargo.toml
+++ b/validator/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
-edition = "2018"
+edition = "2021"
 name = "solana-validator"
 description = "Blockchain, Rebuilt for Scale"
 version = "1.9.0"
diff --git a/version/Cargo.toml b/version/Cargo.toml
index c394793e0e..4d00f370f6 100644
--- a/version/Cargo.toml
+++ b/version/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-version"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 log = "0.4.14"
diff --git a/watchtower/Cargo.toml b/watchtower/Cargo.toml
index 5e6ac9aa48..4a13abd383 100644
--- a/watchtower/Cargo.toml
+++ b/watchtower/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
-edition = "2018"
+edition = "2021"
 name = "solana-watchtower"
 description = "Blockchain, Rebuilt for Scale"
 version = "1.9.0"