Bump up rust to 2021 edition (#1430)

2022-03-12 17:39:21 -05:00 · 2022-03-12 17:39:21 -05:00 · 97a8dfe71d
parent 3c994fcdef
commit 97a8dfe71d
55 changed files with 110 additions and 57 deletions
--- a/avm/Cargo.toml
+++ b/avm/Cargo.toml
@ -1,7 +1,8 @@
 [package]
 name = "avm"
 version = "0.22.1"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [[bin]]
 name = "avm"
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@ -2,7 +2,8 @@
 name = "anchor-cli"
 version = "0.22.1"
 authors = ["armaniferrante <armaniferrante@gmail.com>"]
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [[bin]]
 name = "anchor"
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@ -2,7 +2,8 @@
 name = "anchor-client"
 version = "0.22.1"
 authors = ["Serum Foundation <foundation@projectserum.com>"]
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"
 license = "Apache-2.0"
 description = "Rust client for Anchor programs"

--- a/client/example/Cargo.toml
+++ b/client/example/Cargo.toml
@ -2,7 +2,8 @@
 name = "example"
 version = "0.1.0"
 authors = ["Armani Ferrante <armaniferrante@gmail.com>"]
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [workspace]

--- a/examples/tutorial/basic-0/programs/basic-0/Cargo.toml
+++ b/examples/tutorial/basic-0/programs/basic-0/Cargo.toml
@ -2,7 +2,8 @@
 name = "basic-0"
 version = "0.1.0"
 description = "Created with Anchor"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 crate-type = ["cdylib", "lib"]
--- a/examples/tutorial/basic-1/programs/basic-1/Cargo.toml
+++ b/examples/tutorial/basic-1/programs/basic-1/Cargo.toml
@ -2,7 +2,8 @@
 name = "basic-1"
 version = "0.1.0"
 description = "Created with Anchor"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 crate-type = ["cdylib", "lib"]
--- a/examples/tutorial/basic-2/programs/basic-2/Cargo.toml
+++ b/examples/tutorial/basic-2/programs/basic-2/Cargo.toml
@ -2,7 +2,8 @@
 name = "basic-2"
 version = "0.1.0"
 description = "Created with Anchor"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 crate-type = ["cdylib", "lib"]
--- a/examples/tutorial/basic-3/programs/puppet-master/Cargo.toml
+++ b/examples/tutorial/basic-3/programs/puppet-master/Cargo.toml
@ -2,7 +2,8 @@
 name = "puppet-master"
 version = "0.1.0"
 description = "Created with Anchor"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 crate-type = ["cdylib", "lib"]
--- a/examples/tutorial/basic-3/programs/puppet/Cargo.toml
+++ b/examples/tutorial/basic-3/programs/puppet/Cargo.toml
@ -2,7 +2,8 @@
 name = "puppet"
 version = "0.1.0"
 description = "Created with Anchor"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 crate-type = ["cdylib", "lib"]
--- a/examples/tutorial/basic-4/programs/basic-4/Cargo.toml
+++ b/examples/tutorial/basic-4/programs/basic-4/Cargo.toml
@ -2,7 +2,8 @@
 name = "basic-4"
 version = "0.1.0"
 description = "Created with Anchor"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 crate-type = ["cdylib", "lib"]
--- a/lang/Cargo.toml
+++ b/lang/Cargo.toml
@ -3,7 +3,8 @@ name = "anchor-lang"
 version = "0.22.1"
 authors = ["Serum Foundation <foundation@projectserum.com>"]
 repository = "https://github.com/project-serum/anchor"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"
 license = "Apache-2.0"
 description = "Solana Sealevel eDSL"

--- a/lang/attribute/access-control/Cargo.toml
+++ b/lang/attribute/access-control/Cargo.toml
@ -5,7 +5,8 @@ authors = ["Serum Foundation <foundation@projectserum.com>"]
 repository = "https://github.com/project-serum/anchor"
 license = "Apache-2.0"
 description = "Anchor attribute macro for instruction access control"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 proc-macro = true
--- a/lang/attribute/account/Cargo.toml
+++ b/lang/attribute/account/Cargo.toml
@ -5,7 +5,8 @@ authors = ["Serum Foundation <foundation@projectserum.com>"]
 repository = "https://github.com/project-serum/anchor"
 license = "Apache-2.0"
 description = "Anchor attribute macro for defining an account"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 proc-macro = true
--- a/lang/attribute/constant/Cargo.toml
+++ b/lang/attribute/constant/Cargo.toml
@ -5,7 +5,8 @@ authors = ["Serum Foundation <foundation@projectserum.com>"]
 repository = "https://github.com/project-serum/anchor"
 license = "Apache-2.0"
 description = "Anchor attribute macro for creating constant types"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 proc-macro = true
--- a/lang/attribute/error/Cargo.toml
+++ b/lang/attribute/error/Cargo.toml
@ -5,7 +5,8 @@ authors = ["Serum Foundation <foundation@projectserum.com>"]
 repository = "https://github.com/project-serum/anchor"
 license = "Apache-2.0"
 description = "Anchor attribute macro for creating error types"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 proc-macro = true
--- a/lang/attribute/event/Cargo.toml
+++ b/lang/attribute/event/Cargo.toml
@ -5,7 +5,8 @@ authors = ["Serum Foundation <foundation@projectserum.com>"]
 repository = "https://github.com/project-serum/anchor"
 license = "Apache-2.0"
 description = "Anchor attribute macro for defining an event"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 proc-macro = true
--- a/lang/attribute/interface/Cargo.toml
+++ b/lang/attribute/interface/Cargo.toml
@ -5,7 +5,8 @@ authors = ["Serum Foundation <foundation@projectserum.com>"]
 repository = "https://github.com/project-serum/anchor"
 license = "Apache-2.0"
 description = "Attribute for defining a program interface trait"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 proc-macro = true
--- a/lang/attribute/program/Cargo.toml
+++ b/lang/attribute/program/Cargo.toml
@ -5,7 +5,8 @@ authors = ["Serum Foundation <foundation@projectserum.com>"]
 repository = "https://github.com/project-serum/anchor"
 license = "Apache-2.0"
 description = "Anchor attribute macro for defining a program"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 proc-macro = true
--- a/lang/attribute/state/Cargo.toml
+++ b/lang/attribute/state/Cargo.toml
@ -5,7 +5,8 @@ authors = ["Serum Foundation <foundation@projectserum.com>"]
 repository = "https://github.com/project-serum/anchor"
 license = "Apache-2.0"
 description = "Attribute for defining a program state struct"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 proc-macro = true
--- a/lang/derive/accounts/Cargo.toml
+++ b/lang/derive/accounts/Cargo.toml
@ -5,7 +5,8 @@ authors = ["Serum Foundation <foundation@projectserum.com>"]
 repository = "https://github.com/project-serum/anchor"
 license = "Apache-2.0"
 description = "Anchor Derive macro for accounts"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 proc-macro = true
--- a/lang/syn/Cargo.toml
+++ b/lang/syn/Cargo.toml
@ -5,7 +5,8 @@ authors = ["Serum Foundation <foundation@projectserum.com>"]
 repository = "https://github.com/project-serum/anchor"
 license = "Apache-2.0"
 description = "Anchor syntax parsing and code generation tools"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [features]
 init-if-needed = []
--- a/lang/syn/src/codegen/accounts/__cpi_client_accounts.rs
+++ b/lang/syn/src/codegen/accounts/__cpi_client_accounts.rs
@ -159,12 +159,12 @@ pub fn generate(accs: &AccountsStruct) -> proc_macro2::TokenStream {
            #(#re_exports)*

            #struct_doc
-            pub struct #name#generics {
+            pub struct #name #generics {
                #(#account_struct_fields),*
            }

            #[automatically_derived]
-            impl#generics anchor_lang::ToAccountMetas for #name#generics {
+            impl #generics anchor_lang::ToAccountMetas for #name #generics {
                fn to_account_metas(&self, is_signer: Option<bool>) -> Vec<anchor_lang::solana_program::instruction::AccountMeta> {
                    let mut account_metas = vec![];
                    #(#account_struct_metas)*
@ -173,7 +173,7 @@ pub fn generate(accs: &AccountsStruct) -> proc_macro2::TokenStream {
            }

            #[automatically_derived]
-            impl<'info> anchor_lang::ToAccountInfos<'info> for #name#generics {
+            impl<'info> anchor_lang::ToAccountInfos<'info> for #name #generics {
                fn to_account_infos(&self) -> Vec<anchor_lang::solana_program::account_info::AccountInfo<'info>> {
                    let mut account_infos = vec![];
                    #(#account_struct_infos)*
--- a/lang/syn/src/codegen/accounts/to_account_metas.rs
+++ b/lang/syn/src/codegen/accounts/to_account_metas.rs
@ -29,7 +29,7 @@ pub fn generate(accs: &AccountsStruct) -> proc_macro2::TokenStream {

    quote! {
        #[automatically_derived]
-        impl#impl_gen anchor_lang::ToAccountMetas for #name #ty_gen #where_clause{
+        impl #impl_gen anchor_lang::ToAccountMetas for #name #ty_gen #where_clause{
            fn to_account_metas(&self, is_signer: Option<bool>) -> Vec<anchor_lang::solana_program::instruction::AccountMeta> {
                let mut account_metas = vec![];

--- a/spl/Cargo.toml
+++ b/spl/Cargo.toml
@ -2,7 +2,8 @@
 name = "anchor-spl"
 version = "0.22.1"
 authors = ["Serum Foundation <foundation@projectserum.com>"]
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"
 license = "Apache-2.0"
 description = "CPI clients for SPL programs"

--- a/tests/bpf-upgradeable-state/programs/bpf-upgradeable-state/Cargo.toml
+++ b/tests/bpf-upgradeable-state/programs/bpf-upgradeable-state/Cargo.toml
@ -2,7 +2,8 @@
 name = "bpf-upgradeable-state"
 version = "0.1.0"
 description = "Created with Anchor"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 crate-type = ["cdylib", "lib"]
--- a/tests/cashiers-check/programs/cashiers-check/Cargo.toml
+++ b/tests/cashiers-check/programs/cashiers-check/Cargo.toml
@ -2,7 +2,8 @@
 name = "cashiers-check"
 version = "0.1.0"
 description = "Created with Anchor"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 crate-type = ["cdylib", "lib"]
--- a/tests/cfo/programs/cfo/Cargo.toml
+++ b/tests/cfo/programs/cfo/Cargo.toml
@ -2,7 +2,8 @@
 name = "cfo"
 version = "0.1.0"
 description = "Created with Anchor"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 crate-type = ["cdylib", "lib"]
--- a/tests/chat/programs/chat/Cargo.toml
+++ b/tests/chat/programs/chat/Cargo.toml
@ -2,7 +2,8 @@
 name = "chat"
 version = "0.1.0"
 description = "Created with Anchor"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 crate-type = ["cdylib", "lib"]
--- a/tests/composite/programs/composite/Cargo.toml
+++ b/tests/composite/programs/composite/Cargo.toml
@ -2,7 +2,8 @@
 name = "composite"
 version = "0.1.0"
 description = "Created with Anchor"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 crate-type = ["cdylib", "lib"]
--- a/tests/custom-coder/programs/custom-coder/Cargo.toml
+++ b/tests/custom-coder/programs/custom-coder/Cargo.toml
@ -2,7 +2,8 @@
 name = "custom-coder"
 version = "0.1.0"
 description = "Created with Anchor"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 crate-type = ["cdylib", "lib"]
--- a/tests/custom-coder/programs/spl-token/Cargo.toml
+++ b/tests/custom-coder/programs/spl-token/Cargo.toml
@ -2,7 +2,8 @@
 name = "spl-token"
 version = "0.1.0"
 description = "Created with Anchor"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 crate-type = ["cdylib", "lib"]
--- a/tests/errors/programs/errors/Cargo.toml
+++ b/tests/errors/programs/errors/Cargo.toml
@ -2,7 +2,8 @@
 name = "errors"
 version = "0.1.0"
 description = "Created with Anchor"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 crate-type = ["cdylib", "lib"]
--- a/tests/escrow/programs/escrow/Cargo.toml
+++ b/tests/escrow/programs/escrow/Cargo.toml
@ -2,7 +2,8 @@
 name = "escrow"
 version = "0.1.0"
 description = "Created with Anchor"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 crate-type = ["cdylib", "lib"]
--- a/tests/events/programs/events/Cargo.toml
+++ b/tests/events/programs/events/Cargo.toml
@ -2,7 +2,8 @@
 name = "events"
 version = "0.1.0"
 description = "Created with Anchor"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 crate-type = ["cdylib", "lib"]
--- a/tests/ido-pool/programs/ido-pool/Cargo.toml
+++ b/tests/ido-pool/programs/ido-pool/Cargo.toml
@ -2,7 +2,8 @@
 name = "ido-pool"
 version = "0.1.0"
 description = "Created with Anchor"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 crate-type = ["cdylib", "lib"]
--- a/tests/interface/programs/counter-auth/Cargo.toml
+++ b/tests/interface/programs/counter-auth/Cargo.toml
@ -2,7 +2,8 @@
 name = "counter-auth"
 version = "0.1.0"
 description = "Created with Anchor"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 crate-type = ["cdylib", "lib"]
--- a/tests/interface/programs/counter/Cargo.toml
+++ b/tests/interface/programs/counter/Cargo.toml
@ -2,7 +2,8 @@
 name = "counter"
 version = "0.1.0"
 description = "Created with Anchor"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 crate-type = ["cdylib", "lib"]
--- a/tests/lockup/programs/lockup/Cargo.toml
+++ b/tests/lockup/programs/lockup/Cargo.toml
@ -2,7 +2,8 @@
 name = "lockup"
 version = "0.1.0"
 description = "Created with Anchor"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 crate-type = ["cdylib", "lib"]
--- a/tests/lockup/programs/registry/Cargo.toml
+++ b/tests/lockup/programs/registry/Cargo.toml
@ -2,7 +2,8 @@
 name = "registry"
 version = "0.1.0"
 description = "Created with Anchor"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 crate-type = ["cdylib", "lib"]
--- a/tests/misc/programs/misc/Cargo.toml
+++ b/tests/misc/programs/misc/Cargo.toml
@ -2,7 +2,8 @@
 name = "misc"
 version = "0.1.0"
 description = "Created with Anchor"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 crate-type = ["cdylib", "lib"]
--- a/tests/misc/programs/misc2/Cargo.toml
+++ b/tests/misc/programs/misc2/Cargo.toml
@ -2,7 +2,8 @@
 name = "misc2"
 version = "0.1.0"
 description = "Created with Anchor"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 crate-type = ["cdylib", "lib"]
--- a/tests/misc/programs/shared/Cargo.toml
+++ b/tests/misc/programs/shared/Cargo.toml
@ -1,7 +1,8 @@
 [package]
 name = "shared"
 version = "0.1.0"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

--- a/tests/multisig/programs/multisig/Cargo.toml
+++ b/tests/multisig/programs/multisig/Cargo.toml
@ -2,7 +2,8 @@
 name = "multisig"
 version = "0.1.0"
 description = "Created with Anchor"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 crate-type = ["cdylib", "lib"]
--- a/tests/pda-derivation/programs/pda-derivation/Cargo.toml
+++ b/tests/pda-derivation/programs/pda-derivation/Cargo.toml
@ -2,7 +2,8 @@
 name = "pda-derivation"
 version = "0.1.0"
 description = "Created with Anchor"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 crate-type = ["cdylib", "lib"]
--- a/tests/pyth/programs/pyth/Cargo.toml
+++ b/tests/pyth/programs/pyth/Cargo.toml
@ -2,7 +2,8 @@
 name = "pyth"
 version = "0.1.0"
 description = "Created with Anchor"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 crate-type = ["cdylib", "lib"]
--- a/tests/spl/token-proxy/programs/token-proxy/Cargo.toml
+++ b/tests/spl/token-proxy/programs/token-proxy/Cargo.toml
@ -2,7 +2,8 @@
 name = "token-proxy"
 version = "0.1.0"
 description = "Created with Anchor"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 crate-type = ["cdylib", "lib"]
--- a/tests/swap/programs/swap/Cargo.toml
+++ b/tests/swap/programs/swap/Cargo.toml
@ -2,7 +2,8 @@
 name = "swap"
 version = "0.1.0"
 description = "Created with Anchor"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 crate-type = ["cdylib", "lib"]
--- a/tests/system-accounts/programs/system-accounts/Cargo.toml
+++ b/tests/system-accounts/programs/system-accounts/Cargo.toml
@ -2,7 +2,8 @@
 name = "system-accounts"
 version = "0.1.0"
 description = "Created with Anchor"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 crate-type = ["cdylib", "lib"]
--- a/tests/sysvars/programs/sysvars/Cargo.toml
+++ b/tests/sysvars/programs/sysvars/Cargo.toml
@ -2,7 +2,8 @@
 name = "sysvars"
 version = "0.1.0"
 description = "Created with Anchor"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 crate-type = ["cdylib", "lib"]
--- a/tests/tictactoe/programs/tictactoe/Cargo.toml
+++ b/tests/tictactoe/programs/tictactoe/Cargo.toml
@ -2,7 +2,8 @@
 name = "tictactoe"
 version = "0.1.0"
 description = "Created with Anchor"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 crate-type = ["cdylib", "lib"]
--- a/tests/typescript/programs/shared/Cargo.toml
+++ b/tests/typescript/programs/shared/Cargo.toml
@ -1,7 +1,8 @@
 [package]
 name = "shared"
 version = "0.1.0"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

--- a/tests/typescript/programs/typescript/Cargo.toml
+++ b/tests/typescript/programs/typescript/Cargo.toml
@ -2,7 +2,8 @@
 name = "typescript"
 version = "0.1.0"
 description = "Created with Anchor"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 crate-type = ["cdylib", "lib"]
--- a/tests/zero-copy/programs/shared/Cargo.toml
+++ b/tests/zero-copy/programs/shared/Cargo.toml
@ -1,7 +1,8 @@
 [package]
 name = "shared"
 version = "0.1.0"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

--- a/tests/zero-copy/programs/zero-copy/Cargo.toml
+++ b/tests/zero-copy/programs/zero-copy/Cargo.toml
@ -2,7 +2,8 @@
 name = "zero-copy"
 version = "0.1.0"
 description = "Created with Anchor"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 crate-type = ["cdylib", "lib"]
--- a/tests/zero-copy/programs/zero-cpi/Cargo.toml
+++ b/tests/zero-copy/programs/zero-cpi/Cargo.toml
@ -2,7 +2,8 @@
 name = "zero-cpi"
 version = "0.1.0"
 description = "Created with Anchor"
-edition = "2018"
+rust-version = "1.56"
+edition = "2021"

 [lib]
 crate-type = ["cdylib", "lib"]