diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d65be4436..8ab20a02c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,9 @@ The minor version will be incremented upon a breaking change and the patch versi ### Fixes +- syn: Add missing `new_from_array` method to `Hash` ([#2682](https://github.com/coral-xyz/anchor/pull/2682)). +- cli: Switch to Cargo feature resolver(`resolver = "2"`) ([#2676](https://github.com/coral-xyz/anchor/pull/2676)). + ### Breaking ## [0.29.0] - 2023-10-16 diff --git a/Cargo.toml b/Cargo.toml index cb142aac1b..78a2c739fd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,3 +19,4 @@ exclude = [ "tests/swap/deps/openbook-dex", "tests/cfo/deps/openbook-dex", ] +resolver = "2" diff --git a/cli/src/rust_template.rs b/cli/src/rust_template.rs index 8ec63ee19a..7375908a87 100644 --- a/cli/src/rust_template.rs +++ b/cli/src/rust_template.rs @@ -149,6 +149,7 @@ const fn workspace_manifest() -> &'static str { members = [ "programs/*" ] +resolver = "2" [profile.release] overflow-checks = true diff --git a/tests/anchor-cli-account/Cargo.toml b/tests/anchor-cli-account/Cargo.toml index e1a55ac1ec..6a8277c1a5 100644 --- a/tests/anchor-cli-account/Cargo.toml +++ b/tests/anchor-cli-account/Cargo.toml @@ -5,3 +5,4 @@ overflow-checks = true members = [ "programs/*" ] +resolver = "2" diff --git a/tests/anchor-cli-idl/Cargo.toml b/tests/anchor-cli-idl/Cargo.toml index e1a55ac1ec..6a8277c1a5 100644 --- a/tests/anchor-cli-idl/Cargo.toml +++ b/tests/anchor-cli-idl/Cargo.toml @@ -5,3 +5,4 @@ overflow-checks = true members = [ "programs/*" ] +resolver = "2" diff --git a/tests/auction-house/Cargo.toml b/tests/auction-house/Cargo.toml index a60de986d3..946f3922e5 100644 --- a/tests/auction-house/Cargo.toml +++ b/tests/auction-house/Cargo.toml @@ -2,3 +2,4 @@ members = [ "programs/*" ] +resolver = "2" diff --git a/tests/bench/Cargo.toml b/tests/bench/Cargo.toml index a60de986d3..946f3922e5 100644 --- a/tests/bench/Cargo.toml +++ b/tests/bench/Cargo.toml @@ -2,3 +2,4 @@ members = [ "programs/*" ] +resolver = "2" diff --git a/tests/bpf-upgradeable-state/Cargo.toml b/tests/bpf-upgradeable-state/Cargo.toml index a60de986d3..946f3922e5 100644 --- a/tests/bpf-upgradeable-state/Cargo.toml +++ b/tests/bpf-upgradeable-state/Cargo.toml @@ -2,3 +2,4 @@ members = [ "programs/*" ] +resolver = "2" diff --git a/tests/cashiers-check/Cargo.toml b/tests/cashiers-check/Cargo.toml index a60de986d3..946f3922e5 100644 --- a/tests/cashiers-check/Cargo.toml +++ b/tests/cashiers-check/Cargo.toml @@ -2,3 +2,4 @@ members = [ "programs/*" ] +resolver = "2" diff --git a/tests/cfo/Cargo.toml b/tests/cfo/Cargo.toml index 8be2caae6d..99bba92391 100644 --- a/tests/cfo/Cargo.toml +++ b/tests/cfo/Cargo.toml @@ -7,3 +7,4 @@ exclude = [ "deps/stake", "deps/swap" ] +resolver = "2" diff --git a/tests/chat/Cargo.toml b/tests/chat/Cargo.toml index a60de986d3..946f3922e5 100644 --- a/tests/chat/Cargo.toml +++ b/tests/chat/Cargo.toml @@ -2,3 +2,4 @@ members = [ "programs/*" ] +resolver = "2" diff --git a/tests/composite/Cargo.toml b/tests/composite/Cargo.toml index a60de986d3..946f3922e5 100644 --- a/tests/composite/Cargo.toml +++ b/tests/composite/Cargo.toml @@ -2,3 +2,4 @@ members = [ "programs/*" ] +resolver = "2" diff --git a/tests/cpi-returns/Cargo.toml b/tests/cpi-returns/Cargo.toml index a60de986d3..946f3922e5 100644 --- a/tests/cpi-returns/Cargo.toml +++ b/tests/cpi-returns/Cargo.toml @@ -2,3 +2,4 @@ members = [ "programs/*" ] +resolver = "2" diff --git a/tests/custom-coder/Cargo.toml b/tests/custom-coder/Cargo.toml index a60de986d3..946f3922e5 100644 --- a/tests/custom-coder/Cargo.toml +++ b/tests/custom-coder/Cargo.toml @@ -2,3 +2,4 @@ members = [ "programs/*" ] +resolver = "2" diff --git a/tests/declare-id/Cargo.toml b/tests/declare-id/Cargo.toml index a60de986d3..946f3922e5 100644 --- a/tests/declare-id/Cargo.toml +++ b/tests/declare-id/Cargo.toml @@ -2,3 +2,4 @@ members = [ "programs/*" ] +resolver = "2" diff --git a/tests/docs/Cargo.toml b/tests/docs/Cargo.toml index a60de986d3..946f3922e5 100644 --- a/tests/docs/Cargo.toml +++ b/tests/docs/Cargo.toml @@ -2,3 +2,4 @@ members = [ "programs/*" ] +resolver = "2" diff --git a/tests/errors/Cargo.toml b/tests/errors/Cargo.toml index a60de986d3..946f3922e5 100644 --- a/tests/errors/Cargo.toml +++ b/tests/errors/Cargo.toml @@ -2,3 +2,4 @@ members = [ "programs/*" ] +resolver = "2" diff --git a/tests/escrow/Cargo.toml b/tests/escrow/Cargo.toml index a60de986d3..946f3922e5 100644 --- a/tests/escrow/Cargo.toml +++ b/tests/escrow/Cargo.toml @@ -2,3 +2,4 @@ members = [ "programs/*" ] +resolver = "2" diff --git a/tests/events/Cargo.toml b/tests/events/Cargo.toml index a60de986d3..946f3922e5 100644 --- a/tests/events/Cargo.toml +++ b/tests/events/Cargo.toml @@ -2,3 +2,4 @@ members = [ "programs/*" ] +resolver = "2" diff --git a/tests/floats/Cargo.toml b/tests/floats/Cargo.toml index a60de986d3..946f3922e5 100644 --- a/tests/floats/Cargo.toml +++ b/tests/floats/Cargo.toml @@ -2,3 +2,4 @@ members = [ "programs/*" ] +resolver = "2" diff --git a/tests/idl/Cargo.toml b/tests/idl/Cargo.toml index ef17a63c0a..f397704811 100644 --- a/tests/idl/Cargo.toml +++ b/tests/idl/Cargo.toml @@ -2,6 +2,7 @@ members = [ "programs/*" ] +resolver = "2" [profile.release] overflow-checks = true diff --git a/tests/ido-pool/Cargo.toml b/tests/ido-pool/Cargo.toml index a60de986d3..946f3922e5 100644 --- a/tests/ido-pool/Cargo.toml +++ b/tests/ido-pool/Cargo.toml @@ -2,3 +2,4 @@ members = [ "programs/*" ] +resolver = "2" diff --git a/tests/lockup/Cargo.toml b/tests/lockup/Cargo.toml index a60de986d3..946f3922e5 100644 --- a/tests/lockup/Cargo.toml +++ b/tests/lockup/Cargo.toml @@ -2,3 +2,4 @@ members = [ "programs/*" ] +resolver = "2" diff --git a/tests/misc/Cargo.toml b/tests/misc/Cargo.toml index a60de986d3..946f3922e5 100644 --- a/tests/misc/Cargo.toml +++ b/tests/misc/Cargo.toml @@ -2,3 +2,4 @@ members = [ "programs/*" ] +resolver = "2" diff --git a/tests/multiple-suites-run-single/Cargo.toml b/tests/multiple-suites-run-single/Cargo.toml index a60de986d3..946f3922e5 100644 --- a/tests/multiple-suites-run-single/Cargo.toml +++ b/tests/multiple-suites-run-single/Cargo.toml @@ -2,3 +2,4 @@ members = [ "programs/*" ] +resolver = "2" diff --git a/tests/multiple-suites/Cargo.toml b/tests/multiple-suites/Cargo.toml index a60de986d3..946f3922e5 100644 --- a/tests/multiple-suites/Cargo.toml +++ b/tests/multiple-suites/Cargo.toml @@ -2,3 +2,4 @@ members = [ "programs/*" ] +resolver = "2" diff --git a/tests/multisig/Cargo.toml b/tests/multisig/Cargo.toml index a60de986d3..946f3922e5 100644 --- a/tests/multisig/Cargo.toml +++ b/tests/multisig/Cargo.toml @@ -2,3 +2,4 @@ members = [ "programs/*" ] +resolver = "2" diff --git a/tests/optional/Cargo.toml b/tests/optional/Cargo.toml index a60de986d3..946f3922e5 100644 --- a/tests/optional/Cargo.toml +++ b/tests/optional/Cargo.toml @@ -2,3 +2,4 @@ members = [ "programs/*" ] +resolver = "2" diff --git a/tests/pda-derivation/Cargo.toml b/tests/pda-derivation/Cargo.toml index a60de986d3..946f3922e5 100644 --- a/tests/pda-derivation/Cargo.toml +++ b/tests/pda-derivation/Cargo.toml @@ -2,3 +2,4 @@ members = [ "programs/*" ] +resolver = "2" diff --git a/tests/pyth/Cargo.toml b/tests/pyth/Cargo.toml index a60de986d3..946f3922e5 100644 --- a/tests/pyth/Cargo.toml +++ b/tests/pyth/Cargo.toml @@ -2,3 +2,4 @@ members = [ "programs/*" ] +resolver = "2" diff --git a/tests/realloc/Cargo.toml b/tests/realloc/Cargo.toml index a60de986d3..946f3922e5 100644 --- a/tests/realloc/Cargo.toml +++ b/tests/realloc/Cargo.toml @@ -2,3 +2,4 @@ members = [ "programs/*" ] +resolver = "2" diff --git a/tests/relations-derivation/Cargo.toml b/tests/relations-derivation/Cargo.toml index a60de986d3..946f3922e5 100644 --- a/tests/relations-derivation/Cargo.toml +++ b/tests/relations-derivation/Cargo.toml @@ -2,3 +2,4 @@ members = [ "programs/*" ] +resolver = "2" diff --git a/tests/safety-checks/Cargo.toml b/tests/safety-checks/Cargo.toml index a60de986d3..946f3922e5 100644 --- a/tests/safety-checks/Cargo.toml +++ b/tests/safety-checks/Cargo.toml @@ -2,3 +2,4 @@ members = [ "programs/*" ] +resolver = "2" diff --git a/tests/spl/metadata/Cargo.toml b/tests/spl/metadata/Cargo.toml index ef17a63c0a..f397704811 100644 --- a/tests/spl/metadata/Cargo.toml +++ b/tests/spl/metadata/Cargo.toml @@ -2,6 +2,7 @@ members = [ "programs/*" ] +resolver = "2" [profile.release] overflow-checks = true diff --git a/tests/spl/token-proxy/Cargo.toml b/tests/spl/token-proxy/Cargo.toml index a60de986d3..946f3922e5 100644 --- a/tests/spl/token-proxy/Cargo.toml +++ b/tests/spl/token-proxy/Cargo.toml @@ -2,3 +2,4 @@ members = [ "programs/*" ] +resolver = "2" diff --git a/tests/spl/token-wrapper/Cargo.toml b/tests/spl/token-wrapper/Cargo.toml index a60de986d3..946f3922e5 100644 --- a/tests/spl/token-wrapper/Cargo.toml +++ b/tests/spl/token-wrapper/Cargo.toml @@ -2,3 +2,4 @@ members = [ "programs/*" ] +resolver = "2" diff --git a/tests/swap/Cargo.toml b/tests/swap/Cargo.toml index 57175a48fd..c0e75bd2ec 100644 --- a/tests/swap/Cargo.toml +++ b/tests/swap/Cargo.toml @@ -4,4 +4,5 @@ members = [ ] exclude = [ "deps/openbook-dex" -] \ No newline at end of file +] +resolver = "2" diff --git a/tests/system-accounts/Cargo.toml b/tests/system-accounts/Cargo.toml index a60de986d3..946f3922e5 100644 --- a/tests/system-accounts/Cargo.toml +++ b/tests/system-accounts/Cargo.toml @@ -2,3 +2,4 @@ members = [ "programs/*" ] +resolver = "2" diff --git a/tests/sysvars/Cargo.toml b/tests/sysvars/Cargo.toml index a60de986d3..946f3922e5 100644 --- a/tests/sysvars/Cargo.toml +++ b/tests/sysvars/Cargo.toml @@ -2,3 +2,4 @@ members = [ "programs/*" ] +resolver = "2" diff --git a/tests/tictactoe/Cargo.toml b/tests/tictactoe/Cargo.toml index a60de986d3..946f3922e5 100644 --- a/tests/tictactoe/Cargo.toml +++ b/tests/tictactoe/Cargo.toml @@ -2,3 +2,4 @@ members = [ "programs/*" ] +resolver = "2" diff --git a/tests/typescript/Cargo.toml b/tests/typescript/Cargo.toml index a60de986d3..946f3922e5 100644 --- a/tests/typescript/Cargo.toml +++ b/tests/typescript/Cargo.toml @@ -2,3 +2,4 @@ members = [ "programs/*" ] +resolver = "2" diff --git a/tests/validator-clone/Cargo.toml b/tests/validator-clone/Cargo.toml index a60de986d3..946f3922e5 100644 --- a/tests/validator-clone/Cargo.toml +++ b/tests/validator-clone/Cargo.toml @@ -2,3 +2,4 @@ members = [ "programs/*" ] +resolver = "2" diff --git a/tests/zero-copy/Cargo.toml b/tests/zero-copy/Cargo.toml index a60de986d3..946f3922e5 100644 --- a/tests/zero-copy/Cargo.toml +++ b/tests/zero-copy/Cargo.toml @@ -2,3 +2,4 @@ members = [ "programs/*" ] +resolver = "2"