Upgrade to Rust 2021

2021-11-30 16:47:00 -08:00
parent 098dba607a
commit dd12d90eac
129 changed files with 128 additions and 130 deletions
--- 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]
--- 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" }
--- 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" }
--- 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" }
--- 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" }
--- 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" }
--- 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" }
--- 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 }
--- 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" }
--- 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" }
--- 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"
--- 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" }
--- 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" }
--- 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" }
--- 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"]
--- 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" }
--- 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" }
--- 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" }
--- 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"]
--- 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" }
--- 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" }
--- 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" }
--- 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" }
--- 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 = []
--- 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" ] }
--- 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" }
--- 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" }
--- 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" }
--- 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" }
--- 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"] }
--- 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"]
--- 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"]
--- 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" }
--- 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" }
--- 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 = []
--- 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" }
--- 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"
--- 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" }
--- 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" }
--- 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" }
--- 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" }
--- 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" }
--- 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"
--- 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" }
--- 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"
--- 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"
--- 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"