Remove rust-version from crate manifests (#3000)

coral-xyz · May 31, 2024 · efe2e40 · efe2e40
1 parent 5601702
commit efe2e40
Show file tree

Hide file tree

Showing 64 changed files with 3 additions and 69 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -38,6 +38,7 @@ The minor version will be incremented upon a breaking change and the patch versi
 - cli: Fix IDL write getting corrupted from retries ([#2964](https://github.com/coral-xyz/anchor/pull/2964)).
 - idl: Fix `unexpected_cfgs` build warning ([#2992](https://github.com/coral-xyz/anchor/pull/2992)).
 - lang: Make tuple struct fields public in `declare_program!` ([#2994](https://github.com/coral-xyz/anchor/pull/2994)).
+- Remove `rust-version` from crate manifests ([#3000](https://github.com/coral-xyz/anchor/pull/3000)).
 
 ### Breaking
 

diff --git a/avm/Cargo.toml b/avm/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "avm"
 version = "0.30.0"
-rust-version = "1.60"
 edition = "2021"
 
 [[bin]]

diff --git a/client/Cargo.toml b/client/Cargo.toml
@@ -2,7 +2,6 @@
 name = "anchor-client"
 version = "0.30.0"
 authors = ["Anchor Maintainers <[email protected]>"]
-rust-version = "1.60"
 edition = "2021"
 license = "Apache-2.0"
 description = "An RPC client to interact with Anchor programs"

diff --git a/client/example/Cargo.toml b/client/example/Cargo.toml
@@ -2,7 +2,6 @@
 name = "example"
 version = "0.1.0"
 authors = ["Armani Ferrante <[email protected]>"]
-rust-version = "1.60"
 edition = "2021"
 
 [workspace]

diff --git a/client/src/cluster.rs b/client/src/cluster.rs
@@ -3,22 +3,17 @@ use serde::{Deserialize, Serialize};
 use std::str::FromStr;
 use url::Url;
 
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, Ord, PartialOrd)]
+#[derive(Serialize, Deserialize, Clone, Debug, Default, Eq, PartialEq, Ord, PartialOrd)]
 pub enum Cluster {
     Testnet,
     Mainnet,
     Devnet,
+    #[default]
     Localnet,
     Debug,
     Custom(String, String),
 }
 
-impl Default for Cluster {
-    fn default() -> Self {
-        Cluster::Localnet
-    }
-}
-
 impl FromStr for Cluster {
     type Err = anyhow::Error;
     fn from_str(s: &str) -> Result<Cluster> {

diff --git a/examples/tutorial/basic-0/programs/basic-0/Cargo.toml b/examples/tutorial/basic-0/programs/basic-0/Cargo.toml
@@ -2,7 +2,6 @@
 name = "basic-0"
 version = "0.1.0"
 description = "Created with Anchor"
-rust-version = "1.60"
 edition = "2021"
 
 [lib]

diff --git a/examples/tutorial/basic-1/programs/basic-1/Cargo.toml b/examples/tutorial/basic-1/programs/basic-1/Cargo.toml
@@ -2,7 +2,6 @@
 name = "basic-1"
 version = "0.1.0"
 description = "Created with Anchor"
-rust-version = "1.60"
 edition = "2021"
 
 [lib]

diff --git a/examples/tutorial/basic-2/programs/basic-2/Cargo.toml b/examples/tutorial/basic-2/programs/basic-2/Cargo.toml
@@ -2,7 +2,6 @@
 name = "basic-2"
 version = "0.1.0"
 description = "Created with Anchor"
-rust-version = "1.60"
 edition = "2021"
 
 [lib]

diff --git a/examples/tutorial/basic-3/programs/puppet-master/Cargo.toml b/examples/tutorial/basic-3/programs/puppet-master/Cargo.toml
@@ -2,7 +2,6 @@
 name = "puppet-master"
 version = "0.1.0"
 description = "Created with Anchor"
-rust-version = "1.60"
 edition = "2021"
 
 [lib]

diff --git a/examples/tutorial/basic-3/programs/puppet/Cargo.toml b/examples/tutorial/basic-3/programs/puppet/Cargo.toml
@@ -2,7 +2,6 @@
 name = "puppet"
 version = "0.1.0"
 description = "Created with Anchor"
-rust-version = "1.60"
 edition = "2021"
 
 [lib]

diff --git a/examples/tutorial/basic-4/programs/basic-4/Cargo.toml b/examples/tutorial/basic-4/programs/basic-4/Cargo.toml
@@ -2,7 +2,6 @@
 name = "basic-4"
 version = "0.1.0"
 description = "Created with Anchor"
-rust-version = "1.60"
 edition = "2021"
 
 [lib]

diff --git a/examples/tutorial/basic-5/programs/basic-5/Cargo.toml b/examples/tutorial/basic-5/programs/basic-5/Cargo.toml
@@ -2,7 +2,6 @@
 name = "basic-5"
 version = "0.1.0"
 description = "Created with Anchor"
-rust-version = "1.60"
 edition = "2021"
 
 [lib]

diff --git a/idl/Cargo.toml b/idl/Cargo.toml
@@ -3,7 +3,6 @@ name = "anchor-lang-idl"
 version = "0.1.0"
 authors = ["Anchor Maintainers <[email protected]>"]
 repository = "https://github.com/coral-xyz/anchor"
-rust-version = "1.60"
 edition = "2021"
 license = "Apache-2.0"
 description = "Anchor framework IDL"

diff --git a/lang/Cargo.toml b/lang/Cargo.toml
@@ -3,7 +3,6 @@ name = "anchor-lang"
 version = "0.30.0"
 authors = ["Anchor Maintainers <[email protected]>"]
 repository = "https://github.com/coral-xyz/anchor"
-rust-version = "1.60"
 edition = "2021"
 license = "Apache-2.0"
 description = "Solana Sealevel eDSL"

diff --git a/lang/attribute/access-control/Cargo.toml b/lang/attribute/access-control/Cargo.toml
@@ -5,7 +5,6 @@ authors = ["Anchor Maintainers <[email protected]>"]
 repository = "https://github.com/coral-xyz/anchor"
 license = "Apache-2.0"
 description = "Anchor attribute macro for instruction access control"
-rust-version = "1.60"
 edition = "2021"
 
 [lib]

diff --git a/lang/attribute/account/Cargo.toml b/lang/attribute/account/Cargo.toml
@@ -5,7 +5,6 @@ authors = ["Anchor Maintainers <[email protected]>"]
 repository = "https://github.com/coral-xyz/anchor"
 license = "Apache-2.0"
 description = "Anchor attribute macro for defining an account"
-rust-version = "1.60"
 edition = "2021"
 
 [lib]

diff --git a/lang/attribute/constant/Cargo.toml b/lang/attribute/constant/Cargo.toml
@@ -5,7 +5,6 @@ authors = ["Anchor Maintainers <[email protected]>"]
 repository = "https://github.com/coral-xyz/anchor"
 license = "Apache-2.0"
 description = "Anchor attribute macro for creating constant types"
-rust-version = "1.60"
 edition = "2021"
 
 [lib]

diff --git a/lang/attribute/error/Cargo.toml b/lang/attribute/error/Cargo.toml
@@ -5,7 +5,6 @@ authors = ["Anchor Maintainers <[email protected]>"]
 repository = "https://github.com/coral-xyz/anchor"
 license = "Apache-2.0"
 description = "Anchor attribute macro for creating error types"
-rust-version = "1.60"
 edition = "2021"
 
 [lib]

diff --git a/lang/attribute/program/Cargo.toml b/lang/attribute/program/Cargo.toml
@@ -5,7 +5,6 @@ authors = ["Anchor Maintainers <[email protected]>"]
 repository = "https://github.com/coral-xyz/anchor"
 license = "Apache-2.0"
 description = "Anchor attribute macro for defining a program"
-rust-version = "1.60"
 edition = "2021"
 
 [lib]

diff --git a/lang/derive/accounts/Cargo.toml b/lang/derive/accounts/Cargo.toml
@@ -5,7 +5,6 @@ authors = ["Anchor Maintainers <[email protected]>"]
 repository = "https://github.com/coral-xyz/anchor"
 license = "Apache-2.0"
 description = "Anchor Derive macro for accounts"
-rust-version = "1.60"
 edition = "2021"
 
 [lib]

diff --git a/lang/derive/serde/Cargo.toml b/lang/derive/serde/Cargo.toml
@@ -5,7 +5,6 @@ authors = ["Anchor Maintainers <[email protected]>"]
 repository = "https://github.com/coral-xyz/anchor"
 license = "Apache-2.0"
 description = "Anchor Derive macro for serialization and deserialization"
-rust-version = "1.60"
 edition = "2021"
 
 [lib]

diff --git a/lang/derive/space/Cargo.toml b/lang/derive/space/Cargo.toml
@@ -5,7 +5,6 @@ authors = ["Anchor Maintainers <[email protected]>"]
 repository = "https://github.com/coral-xyz/anchor"
 license = "Apache-2.0"
 description = "Anchor Derive macro to automatically calculate the size of a structure or an enum"
-rust-version = "1.60"
 edition = "2021"
 
 [lib]

diff --git a/lang/syn/Cargo.toml b/lang/syn/Cargo.toml
@@ -5,7 +5,6 @@ authors = ["Anchor Maintainers <[email protected]>"]
 repository = "https://github.com/coral-xyz/anchor"
 license = "Apache-2.0"
 description = "Anchor syntax parsing and code generation tools"
-rust-version = "1.60"
 edition = "2021"
 
 [package.metadata.docs.rs]

diff --git a/spl/Cargo.toml b/spl/Cargo.toml
@@ -2,7 +2,6 @@
 name = "anchor-spl"
 version = "0.30.0"
 authors = ["Anchor Maintainers <[email protected]>"]
-rust-version = "1.60"
 edition = "2021"
 license = "Apache-2.0"
 description = "CPI clients for SPL programs"

diff --git 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,6 @@
 name = "bpf-upgradeable-state"
 version = "0.1.0"
 description = "Created with Anchor"
-rust-version = "1.60"
 edition = "2021"
 
 [lib]

diff --git a/tests/cashiers-check/programs/cashiers-check/Cargo.toml b/tests/cashiers-check/programs/cashiers-check/Cargo.toml
@@ -2,7 +2,6 @@
 name = "cashiers-check"
 version = "0.1.0"
 description = "Created with Anchor"
-rust-version = "1.60"
 edition = "2021"
 
 [lib]

diff --git a/tests/cfo/programs/cfo/Cargo.toml b/tests/cfo/programs/cfo/Cargo.toml
@@ -2,7 +2,6 @@
 name = "cfo"
 version = "0.1.0"
 description = "Created with Anchor"
-rust-version = "1.60"
 edition = "2021"
 
 [lib]

diff --git a/tests/chat/programs/chat/Cargo.toml b/tests/chat/programs/chat/Cargo.toml
@@ -2,7 +2,6 @@
 name = "chat"
 version = "0.1.0"
 description = "Created with Anchor"
-rust-version = "1.60"
 edition = "2021"
 
 [lib]

diff --git a/tests/composite/programs/composite/Cargo.toml b/tests/composite/programs/composite/Cargo.toml
@@ -2,7 +2,6 @@
 name = "composite"
 version = "0.1.0"
 description = "Created with Anchor"
-rust-version = "1.60"
 edition = "2021"
 
 [lib]

diff --git a/tests/custom-coder/programs/native-system/Cargo.toml b/tests/custom-coder/programs/native-system/Cargo.toml
@@ -2,7 +2,6 @@
 name = "native-system"
 version = "0.1.0"
 description = "Created with Anchor"
-rust-version = "1.60"
 edition = "2021"
 
 [lib]

diff --git a/tests/custom-coder/programs/spl-token/Cargo.toml b/tests/custom-coder/programs/spl-token/Cargo.toml
@@ -2,7 +2,6 @@
 name = "spl-token"
 version = "0.1.0"
 description = "Created with Anchor"
-rust-version = "1.60"
 edition = "2021"
 
 [lib]

diff --git a/tests/declare-program/programs/declare-program/Cargo.toml b/tests/declare-program/programs/declare-program/Cargo.toml
@@ -2,7 +2,6 @@
 name = "declare-program"
 version = "0.1.0"
 description = "Created with Anchor"
-rust-version = "1.60"
 edition = "2021"
 
 [lib]

diff --git a/tests/declare-program/programs/external/Cargo.toml b/tests/declare-program/programs/external/Cargo.toml
@@ -2,7 +2,6 @@
 name = "external"
 version = "0.1.0"
 description = "Created with Anchor"
-rust-version = "1.60"
 edition = "2021"
 
 [lib]

diff --git a/tests/errors/programs/errors/Cargo.toml b/tests/errors/programs/errors/Cargo.toml
@@ -2,7 +2,6 @@
 name = "errors"
 version = "0.1.0"
 description = "Created with Anchor"
-rust-version = "1.60"
 edition = "2021"
 
 [lib]

diff --git a/tests/escrow/programs/escrow/Cargo.toml b/tests/escrow/programs/escrow/Cargo.toml
@@ -2,7 +2,6 @@
 name = "escrow"
 version = "0.1.0"
 description = "Created with Anchor"
-rust-version = "1.60"
 edition = "2021"
 
 [lib]

diff --git a/tests/events/programs/events/Cargo.toml b/tests/events/programs/events/Cargo.toml
@@ -2,7 +2,6 @@
 name = "events"
 version = "0.1.0"
 description = "Created with Anchor"
-rust-version = "1.60"
 edition = "2021"
 
 [lib]

diff --git a/tests/idl/programs/docs/Cargo.toml b/tests/idl/programs/docs/Cargo.toml
@@ -2,7 +2,6 @@
 name = "docs"
 version = "0.1.0"
 description = "Created with Anchor"
-rust-version = "1.60"
 edition = "2021"
 
 [lib]

diff --git a/tests/idl/programs/new-idl/Cargo.toml b/tests/idl/programs/new-idl/Cargo.toml
@@ -2,7 +2,6 @@
 name = "new-idl"
 version = "0.1.0"
 description = "Created with Anchor"
-rust-version = "1.60"
 edition = "2021"
 
 [lib]

diff --git a/tests/idl/programs/relations-derivation/Cargo.toml b/tests/idl/programs/relations-derivation/Cargo.toml
@@ -2,7 +2,6 @@
 name = "relations-derivation"
 version = "0.1.0"
 description = "Created with Anchor"
-rust-version = "1.60"
 edition = "2021"
 
 [lib]

diff --git a/tests/ido-pool/programs/ido-pool/Cargo.toml b/tests/ido-pool/programs/ido-pool/Cargo.toml
@@ -2,7 +2,6 @@
 name = "ido-pool"
 version = "0.1.0"
 description = "Created with Anchor"
-rust-version = "1.60"
 edition = "2021"
 
 [lib]

diff --git a/tests/lockup/programs/lockup/Cargo.toml b/tests/lockup/programs/lockup/Cargo.toml
@@ -2,7 +2,6 @@
 name = "lockup"
 version = "0.1.0"
 description = "Created with Anchor"
-rust-version = "1.60"
 edition = "2021"
 
 [lib]

diff --git a/tests/lockup/programs/registry/Cargo.toml b/tests/lockup/programs/registry/Cargo.toml
@@ -2,7 +2,6 @@
 name = "registry"
 version = "0.1.0"
 description = "Created with Anchor"
-rust-version = "1.60"
 edition = "2021"
 
 [lib]

diff --git a/tests/misc/programs/misc-optional/Cargo.toml b/tests/misc/programs/misc-optional/Cargo.toml
@@ -2,7 +2,6 @@
 name = "misc-optional"
 version = "0.1.0"
 description = "Created with Anchor"
-rust-version = "1.56"
 edition = "2021"
 
 [lib]

diff --git a/tests/misc/programs/misc/Cargo.toml b/tests/misc/programs/misc/Cargo.toml
@@ -2,7 +2,6 @@
 name = "misc"
 version = "0.1.0"
 description = "Created with Anchor"
-rust-version = "1.60"
 edition = "2021"
 
 [lib]

diff --git a/tests/misc/programs/remaining-accounts/Cargo.toml b/tests/misc/programs/remaining-accounts/Cargo.toml
@@ -2,7 +2,6 @@
 name = "remaining-accounts"
 version = "0.1.0"
 description = "Created with Anchor"
-rust-version = "1.60"
 edition = "2021"
 
 [lib]

diff --git a/tests/misc/programs/shared/Cargo.toml b/tests/misc/programs/shared/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "shared"
 version = "0.1.0"
-rust-version = "1.60"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/tests/multisig/programs/multisig/Cargo.toml b/tests/multisig/programs/multisig/Cargo.toml
@@ -2,7 +2,6 @@
 name = "multisig"
 version = "0.1.0"
 description = "Created with Anchor"
-rust-version = "1.60"
 edition = "2021"
 
 [lib]