cli: Fix workspace inheritence (#2570)

This commit is contained in:
acheron 2023-07-14 23:17:23 +02:00 committed by GitHub
parent cfc6d2916b
commit 4e5280be46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 72 additions and 23 deletions

View File

@ -21,6 +21,7 @@ The minor version will be incremented upon a breaking change and the patch versi
- ts: Packages no longer depend on `assert` ([#2535](https://github.com/coral-xyz/anchor/pull/2535)).
- lang: Support for `const` in the `InitSpace` macro ([#2555](https://github.com/coral-xyz/anchor/pull/2555)).
- cli: Support workspace inheritence ([#2570](https://github.com/coral-xyz/anchor/pull/2570)).
### Breaking

90
Cargo.lock generated
View File

@ -207,7 +207,7 @@ dependencies = [
"syn 1.0.109",
"tar",
"tokio",
"toml",
"toml 0.7.6",
"walkdir",
]
@ -954,12 +954,12 @@ dependencies = [
[[package]]
name = "cargo_toml"
version = "0.13.3"
version = "0.15.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "497049e9477329f8f6a559972ee42e117487d01d1e8c2cc9f836ea6fa23a9e1a"
checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838"
dependencies = [
"serde",
"toml",
"toml 0.7.6",
]
[[package]]
@ -1026,7 +1026,7 @@ dependencies = [
"atty",
"bitflags",
"clap_lex 0.2.4",
"indexmap",
"indexmap 1.9.3",
"once_cell",
"strsim 0.10.0",
"termcolor",
@ -1601,6 +1601,12 @@ dependencies = [
"termcolor",
]
[[package]]
name = "equivalent"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
[[package]]
name = "errno"
version = "0.3.1"
@ -1855,7 +1861,7 @@ dependencies = [
"futures-sink",
"futures-util",
"http",
"indexmap",
"indexmap 1.9.3",
"slab",
"tokio",
"tokio-util",
@ -1895,6 +1901,12 @@ dependencies = [
"ahash 0.8.3",
]
[[package]]
name = "hashbrown"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
[[package]]
name = "heck"
version = "0.3.3"
@ -2112,6 +2124,16 @@ dependencies = [
"hashbrown 0.12.3",
]
[[package]]
name = "indexmap"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
dependencies = [
"equivalent",
"hashbrown 0.14.0",
]
[[package]]
name = "indicatif"
version = "0.17.5"
@ -2844,7 +2866,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4"
dependencies = [
"fixedbitset",
"indexmap",
"indexmap 1.9.3",
]
[[package]]
@ -2978,7 +3000,7 @@ version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785"
dependencies = [
"toml",
"toml 0.5.11",
]
[[package]]
@ -3564,6 +3586,15 @@ dependencies = [
"serde",
]
[[package]]
name = "serde_spanned"
version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186"
dependencies = [
"serde",
]
[[package]]
name = "serde_urlencoded"
version = "0.7.1"
@ -3604,7 +3635,7 @@ version = "0.9.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9d684e3ec7de3bf5466b32bd75303ac16f0736426e5a4e0d6e489559ce1249c"
dependencies = [
"indexmap",
"indexmap 1.9.3",
"itoa",
"ryu",
"serde",
@ -3885,7 +3916,7 @@ dependencies = [
"bincode",
"futures",
"futures-util",
"indexmap",
"indexmap 1.9.3",
"indicatif",
"log",
"quinn",
@ -3931,7 +3962,7 @@ dependencies = [
"async-trait",
"bincode",
"futures-util",
"indexmap",
"indexmap 1.9.3",
"log",
"rand 0.7.3",
"rayon",
@ -4398,7 +4429,7 @@ dependencies = [
"crossbeam-channel",
"futures-util",
"histogram",
"indexmap",
"indexmap 1.9.3",
"itertools 0.10.5",
"libc",
"log",
@ -4444,7 +4475,7 @@ dependencies = [
"async-trait",
"bincode",
"futures-util",
"indexmap",
"indexmap 1.9.3",
"indicatif",
"log",
"rand 0.7.3",
@ -5012,18 +5043,35 @@ dependencies = [
]
[[package]]
name = "toml_datetime"
version = "0.6.2"
name = "toml"
version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f"
checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542"
dependencies = [
"serde",
"serde_spanned",
"toml_datetime",
"toml_edit",
]
[[package]]
name = "toml_datetime"
version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
dependencies = [
"serde",
]
[[package]]
name = "toml_edit"
version = "0.19.10"
version = "0.19.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739"
checksum = "5f8751d9c1b03c6500c387e96f81f815a4f8e72d142d2d4a9ffa6fedd51ddee7"
dependencies = [
"indexmap",
"indexmap 2.0.0",
"serde",
"serde_spanned",
"toml_datetime",
"winnow",
]
@ -5568,9 +5616,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
[[package]]
name = "winnow"
version = "0.4.6"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699"
checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7"
dependencies = [
"memchr",
]

View File

@ -23,7 +23,7 @@ anchor-syn = { path = "../lang/syn", features = ["event-cpi", "idl-parse", "init
anyhow = "1.0.32"
base64 = "0.13.1"
bincode = "1.3.3"
cargo_toml = "0.13.0"
cargo_toml = "0.15.3"
chrono = "0.4.19"
clap = { version = "4.2.4", features = ["derive"] }
dirs = "4.0"
@ -46,5 +46,5 @@ solang-parser = "=0.3.1"
syn = { version = "1.0.60", features = ["full", "extra-traits"] }
tar = "0.4.35"
tokio = "~1.14.1"
toml = "0.5.8"
toml = "0.7.6"
walkdir = "2.3.2"