Bump Rust version to 1.56.1, and use 2021 Edition

mvines · mvines · commit 615ea3cfe69c · 2021-12-09T20:51:26.000-08:00
diff --git a/associated-token-account/program/Cargo.toml b/associated-token-account/program/Cargo.toml
@@ -5,7 +5,7 @@ description = "Solana Program Library Associated Token Account"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana-program-library"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [features]
 no-entrypoint = []
diff --git a/binary-option/program/Cargo.toml b/binary-option/program/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "binary-option"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 license = "WTFPL"
 
 [features]
diff --git a/binary-oracle-pair/program/Cargo.toml b/binary-oracle-pair/program/Cargo.toml
@@ -5,7 +5,7 @@ description = "Solana Program Library Binary Oracle Pair"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana-program-library"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [features]
 test-bpf = []
diff --git a/ci/rust-version.sh b/ci/rust-version.sh
@@ -18,13 +18,13 @@
 if [[ -n $RUST_STABLE_VERSION ]]; then
   stable_version="$RUST_STABLE_VERSION"
 else
-  stable_version=1.54.0
+  stable_version=1.56.1
 fi
 
 if [[ -n $RUST_NIGHTLY_VERSION ]]; then
   nightly_version="$RUST_NIGHTLY_VERSION"
 else
-  nightly_version=2021-08-02
+  nightly_version=2021-11-30
 fi
 
 
diff --git a/examples/rust/cross-program-invocation/Cargo.toml b/examples/rust/cross-program-invocation/Cargo.toml
@@ -5,7 +5,7 @@ description = "Solana Program Library Cross Program Invocation Example"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana-program-library"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [features]
diff --git a/examples/rust/custom-heap/Cargo.toml b/examples/rust/custom-heap/Cargo.toml
@@ -5,7 +5,7 @@ description = "Solana Program Library Custom Heap Example"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana-program-library"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [features]
diff --git a/examples/rust/logging/Cargo.toml b/examples/rust/logging/Cargo.toml
@@ -5,7 +5,7 @@ description = "Solana Program Library Logging Example"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana-program-library"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [features]
diff --git a/examples/rust/sysvar/Cargo.toml b/examples/rust/sysvar/Cargo.toml
@@ -5,7 +5,7 @@ description = "Solana Program Library Sysvar Example"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana-program-library"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [features]
diff --git a/examples/rust/transfer-lamports/Cargo.toml b/examples/rust/transfer-lamports/Cargo.toml
@@ -5,7 +5,7 @@ description = "Solana Program Library Transfer Lamports Example"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana-program-library"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [features]
 no-entrypoint = []
diff --git a/farms/farm-client/Cargo.toml b/farms/farm-client/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana-program-library"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
-edition = "2018"
+edition = "2021"
 
 [features]
 debug = []
diff --git a/farms/farm-ctrl/Cargo.toml b/farms/farm-ctrl/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana-program-library"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
-edition = "2018"
+edition = "2021"
 
 [features]
 debug = []
diff --git a/farms/farm-rpc/Cargo.toml b/farms/farm-rpc/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana-program-library"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
-edition = "2018"
+edition = "2021"
 
 [features]
 debug = []
diff --git a/farms/farm-sdk/Cargo.toml b/farms/farm-sdk/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana-program-library"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
-edition = "2018"
+edition = "2021"
 
 [features]
 debug = []
diff --git a/farms/router-main/Cargo.toml b/farms/router-main/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana-program-library"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
-edition = "2018"
+edition = "2021"
 
 [features]
 no-entrypoint = []
diff --git a/farms/router-orca/Cargo.toml b/farms/router-orca/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana-program-library"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
-edition = "2018"
+edition = "2021"
 
 [features]
 no-entrypoint = []
diff --git a/farms/router-raydium/Cargo.toml b/farms/router-raydium/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana-program-library"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
-edition = "2018"
+edition = "2021"
 
 [features]
 no-entrypoint = []
diff --git a/farms/router-saber/Cargo.toml b/farms/router-saber/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana-program-library"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
-edition = "2018"
+edition = "2021"
 
 [features]
 no-entrypoint = []
diff --git a/farms/vaults/Cargo.toml b/farms/vaults/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana-program-library"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
-edition = "2018"
+edition = "2021"
 
 [features]
 no-entrypoint = []
diff --git a/feature-proposal/cli/Cargo.toml b/feature-proposal/cli/Cargo.toml
@@ -5,7 +5,7 @@ description = "SPL Feature Proposal Command-line Utility"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana-program-library"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 chrono = "0.4.19"
diff --git a/feature-proposal/program/Cargo.toml b/feature-proposal/program/Cargo.toml
@@ -5,7 +5,7 @@ description = "Solana Program Library Feature Proposal Program"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana-program-library"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [features]
 no-entrypoint = []
diff --git a/governance/chat/program/Cargo.toml b/governance/chat/program/Cargo.toml
@@ -5,7 +5,7 @@ description = "Solana Program Library Governance Chat Program"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana-program-library"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [features]
 no-entrypoint = []
diff --git a/governance/program/Cargo.toml b/governance/program/Cargo.toml
@@ -5,7 +5,7 @@ description = "Solana Program Library Governance Program"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana-program-library"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [features]
 no-entrypoint = []
diff --git a/governance/test-sdk/Cargo.toml b/governance/test-sdk/Cargo.toml
@@ -5,7 +5,7 @@ description = "Solana Program Library Governance Program Test SDK"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana-program-library"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 arrayref = "0.3.6"
diff --git a/governance/tools/Cargo.toml b/governance/tools/Cargo.toml
@@ -5,7 +5,7 @@ description = "Solana Program Library Governance Tools"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana-program-library"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 arrayref = "0.3.6"
diff --git a/governance/voter-weight-addin/program/Cargo.toml b/governance/voter-weight-addin/program/Cargo.toml
@@ -5,7 +5,7 @@ description = "Solana Program Library Governance Voter Weight Addin Program"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana-program-library"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [features]
 no-entrypoint = []
diff --git a/libraries/math/Cargo.toml b/libraries/math/Cargo.toml
@@ -5,7 +5,7 @@ description = "Solana Program Library Math"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana-program-library"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [features]
 no-entrypoint = []
diff --git a/memo/program/Cargo.toml b/memo/program/Cargo.toml
@@ -5,7 +5,7 @@ description = "Solana Program Library Memo"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana-program-library"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [features]
 no-entrypoint = []
diff --git a/name-service/program/Cargo.toml b/name-service/program/Cargo.toml
@@ -8,7 +8,7 @@ authors = [
   "Solana Maintainers <maintainers@solana.foundation>"
 ]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/record/program/Cargo.toml b/record/program/Cargo.toml
@@ -5,7 +5,7 @@ description = "Solana Program Library Record Program"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana-program-library"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [features]
 no-entrypoint = []
diff --git a/shared-memory/program/Cargo.toml b/shared-memory/program/Cargo.toml
@@ -5,7 +5,7 @@ description = "Solana Program Library Shared-memory"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana-program-library"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [features]
 test-bpf = []
diff --git a/stake-pool/cli/Cargo.toml b/stake-pool/cli/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 description = "SPL-Stake-Pool Command-line Utility"
-edition = "2018"
+edition = "2021"
 homepage = "https://spl.solana.com/stake-pool"
 license = "Apache-2.0"
 name = "spl-stake-pool-cli"
diff --git a/stake-pool/program/Cargo.toml b/stake-pool/program/Cargo.toml
@@ -5,7 +5,7 @@ description = "Solana Program Library Stake Pool"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana-program-library"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [features]
 no-entrypoint = []
diff --git a/stake-pool/program/src/big_vec.rs b/stake-pool/program/src/big_vec.rs
@@ -120,8 +120,8 @@ impl<'data> BigVec<'data> {
         if self.data.len() < end_index {
             return Err(ProgramError::AccountDataTooSmall);
         }
-        let mut element_ref = &mut self.data[start_index..start_index + T::LEN];
-        element.pack_into_slice(&mut element_ref);
+        let element_ref = &mut self.data[start_index..start_index + T::LEN];
+        element.pack_into_slice(element_ref);
         Ok(())
     }
 
diff --git a/stateless-asks/program/Cargo.toml b/stateless-asks/program/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "stateless-asks"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/token-lending/cli/Cargo.toml b/token-lending/cli/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 description = "SPL Token Lending CLI"
-edition = "2018"
+edition = "2021"
 homepage = "https://spl.solana.com/token-lending"
 license = "Apache-2.0"
 name = "spl-token-lending-cli"
diff --git a/token-lending/flash_loan_receiver/Cargo.toml b/token-lending/flash_loan_receiver/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "flash_loan_receiver"
 version = "1.0.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 arrayref = "0.3.6"
diff --git a/token-lending/program/Cargo.toml b/token-lending/program/Cargo.toml
@@ -5,7 +5,7 @@ description = "Solana Program Library Token Lending"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana-program-library"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [features]
 no-entrypoint = []
diff --git a/token-swap/program/Cargo.toml b/token-swap/program/Cargo.toml
@@ -5,7 +5,7 @@ description = "Solana Program Library Token Swap"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana-program-library"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [features]
 no-entrypoint = []
diff --git a/token-swap/program/fuzz/Cargo.toml b/token-swap/program/fuzz/Cargo.toml
@@ -5,7 +5,7 @@ description = "Solana Program Library Token Swap Fuzzer"
 authors = ["Solana Maintainers <maintainers@solana.foundation>"]
 repository = "https://github.com/solana-labs/solana-program-library"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]
diff --git a/token-swap/program/fuzz/src/instructions.rs b/token-swap/program/fuzz/src/instructions.rs
diff --git a/token-swap/program/fuzz/src/native_token_swap.rs b/token-swap/program/fuzz/src/native_token_swap.rs
diff --git a/token-swap/program/sim/Cargo.toml b/token-swap/program/sim/Cargo.toml
diff --git a/token/cli/Cargo.toml b/token/cli/Cargo.toml
diff --git a/token/program-2022/Cargo.toml b/token/program-2022/Cargo.toml
diff --git a/token/program/Cargo.toml b/token/program/Cargo.toml
diff --git a/utils/cgen/Cargo.toml b/utils/cgen/Cargo.toml
diff --git a/utils/test-client/Cargo.toml b/utils/test-client/Cargo.toml

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ authors = [`
`8`	`8`	`"Solana Maintainers <[email protected]>"`
`9`	`9`	`]`
`10`	`10`	`license = "Apache-2.0"`
`11`		`-edition = "2018"`
	`11`	`+edition = "2021"`
`12`	`12`
`13`	`13`	`# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -120,8 +120,8 @@ impl<'data> BigVec<'data> {`
`120`	`120`	`if self.data.len() < end_index {`
`121`	`121`	`return Err(ProgramError::AccountDataTooSmall);`
`122`	`122`	`}`
`123`		`- let mut element_ref = &mut self.data[start_index..start_index + T::LEN];`
`124`		`- element.pack_into_slice(&mut element_ref);`
	`123`	`+ let element_ref = &mut self.data[start_index..start_index + T::LEN];`
	`124`	`+ element.pack_into_slice(element_ref);`
`125`	`125`	`Ok(())`
`126`	`126`	`}`
`127`	`127`