Upgrade to Rust 2021

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"

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"

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"

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"

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"

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"

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"

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"

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"] }

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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

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"] }

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"

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"

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"

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"

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"

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

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

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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

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"

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"

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"

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"

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"

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")]

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"

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"

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"

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"

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]

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

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

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

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

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

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

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 }

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

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

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"

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

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

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

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"]

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

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

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

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"]

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

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

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

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

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 = []

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" ] }

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

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

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

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

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"] }

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"]

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"]

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

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

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 = []

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

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"

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

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

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

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

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

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"

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

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"

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"

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"

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"

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"

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"