Skip to content

Commit

Permalink
chore: Remove duplicate dependency and and alphabetize features (cora…
Browse files Browse the repository at this point in the history 
…l-xyz#2590)
  • Loading branch information
@acheroncrypto
acheroncrypto committed Aug 5, 2023
1 parent 2af9cc6 commit abfdc4e
Show file tree
Hide file tree
Showing 15 changed files with 37 additions and 45 deletions.
4 changes: 2 additions & 2 deletions avm/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ path = "src/anchor/main.rs"
[dependencies]
anyhow = "1.0.32"
cfg-if = "1.0.0"
clap = { version = "4.2.4", features = ["derive"]}
clap = { version = "4.2.4", features = ["derive"] }
dirs = "4.0.0"
once_cell = { version = "1.8.0" }
once_cell = "1.8.0"
reqwest = { version = "0.11.9", default-features = false, features = ["blocking", "json", "rustls-tls"] }
semver = "1.0.4"
serde = { version = "1.0.136", features = ["derive"] }
Expand Down
1 change: 0 additions & 1 deletion cli/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ path = "src/bin/main.rs"

[features]
dev = []
default = []

[dependencies]
anchor-client = { path = "../client", version = "0.28.0" }
Expand Down
4 changes: 2 additions & 2 deletions client/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ license = "Apache-2.0"
description = "Rust client for Anchor programs"

[features]
debug = []
async = []
debug = []

[dependencies]
anchor-lang = { path = "../lang", version = "0.28.0" }
anyhow = "1"
futures = { version = "0.3" }
futures = "0.3"
regex = "1"
serde = { version = "1", features = ["derive"] }
solana-client = ">=1.14, <1.17"
Expand Down
4 changes: 2 additions & 2 deletions client/example/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ basic-4 = { path = "../../examples/tutorial/basic-4/programs/basic-4", features
composite = { path = "../../tests/composite/programs/composite", features = ["no-entrypoint"] }
optional = { path = "../../tests/optional/programs/optional", features = ["no-entrypoint"] }
events = { path = "../../tests/events/programs/events", features = ["no-entrypoint"] }
shellexpand = "2.1.0"
anyhow = "1.0.32"
clap = { version = "4.2.4", features = ["derive"] }
tokio = { version = "1", features = ["full"] }
shellexpand = "2.1.0"
solana-sdk = ">=1.14, <1.17"
tokio = { version = "1", features = ["full"] }
31 changes: 14 additions & 17 deletions lang/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,30 +10,28 @@ description = "Solana Sealevel eDSL"

[features]
allow-missing-optionals = ["anchor-derive-accounts/allow-missing-optionals"]
init-if-needed = ["anchor-derive-accounts/init-if-needed"]
derive = []
default = []
event-cpi = ["anchor-attribute-event/event-cpi"]
idl-build = [
"anchor-syn/idl-build",
"anchor-derive-accounts/idl-build",
"anchor-derive-serde/idl-build",
"anchor-attribute-account/idl-build",
"anchor-attribute-constant/idl-build",
"anchor-attribute-event/idl-build",
"anchor-attribute-error/idl-build",
"anchor-attribute-program/idl-build",
]
anchor-debug = [
"anchor-attribute-access-control/anchor-debug",
"anchor-attribute-account/anchor-debug",
"anchor-attribute-constant/anchor-debug",
"anchor-attribute-error/anchor-debug",
"anchor-attribute-event/anchor-debug",
"anchor-attribute-program/anchor-debug",
"anchor-attribute-program/anchor-debug",
"anchor-derive-accounts/anchor-debug"
]
derive = []
event-cpi = ["anchor-attribute-event/event-cpi"]
idl-build = [
"anchor-attribute-account/idl-build",
"anchor-attribute-constant/idl-build",
"anchor-attribute-event/idl-build",
"anchor-attribute-error/idl-build",
"anchor-attribute-program/idl-build",
"anchor-derive-accounts/idl-build",
"anchor-derive-serde/idl-build",
"anchor-syn/idl-build",
]
init-if-needed = ["anchor-derive-accounts/init-if-needed"]

[dependencies]
anchor-attribute-access-control = { path = "./attribute/access-control", version = "0.28.0" }
Expand All @@ -45,8 +43,7 @@ anchor-attribute-program = { path = "./attribute/program", version = "0.28.0" }
anchor-derive-accounts = { path = "./derive/accounts", version = "0.28.0" }
anchor-derive-serde = { path = "./derive/serde", version = "0.28.0" }
anchor-derive-space = { path = "./derive/space", version = "0.28.0" }
# anchor-syn can and should only be included only for idl-build. It won't compile
# for bpf due to proc-macro2 crate.
# `anchor-syn` should only be included with `idl-build` feature
anchor-syn = { path = "./syn", version = "0.28.0", optional = true }
arrayref = "0.3"
base64 = "0.13"
Expand Down
2 changes: 1 addition & 1 deletion lang/attribute/account/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ edition = "2021"
proc-macro = true

[features]
idl-build = ["anchor-syn/idl-build"]
anchor-debug = ["anchor-syn/anchor-debug"]
idl-build = ["anchor-syn/idl-build"]

[dependencies]
anchor-syn = { path = "../../syn", version = "0.28.0", features = ["hash"] }
Expand Down
2 changes: 1 addition & 1 deletion lang/attribute/constant/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ edition = "2021"
proc-macro = true

[features]
idl-build = ["anchor-syn/idl-build"]
anchor-debug = ["anchor-syn/anchor-debug"]
idl-build = ["anchor-syn/idl-build"]

[dependencies]
anchor-syn = { path = "../../syn", version = "0.28.0" }
Expand Down
2 changes: 1 addition & 1 deletion lang/attribute/error/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ edition = "2021"
proc-macro = true

[features]
idl-build = ["anchor-syn/idl-build"]
anchor-debug = ["anchor-syn/anchor-debug"]
idl-build = ["anchor-syn/idl-build"]

[dependencies]
anchor-syn = { path = "../../syn", version = "0.28.0" }
Expand Down
2 changes: 1 addition & 1 deletion lang/attribute/event/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ edition = "2021"
proc-macro = true

[features]
idl-build = ["anchor-syn/idl-build"]
anchor-debug = ["anchor-syn/anchor-debug"]
event-cpi = ["anchor-syn/event-cpi"]
idl-build = ["anchor-syn/idl-build"]

[dependencies]
anchor-syn = { path = "../../syn", version = "0.28.0", features = ["hash"] }
Expand Down
2 changes: 1 addition & 1 deletion lang/attribute/program/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ edition = "2021"
proc-macro = true

[features]
idl-build = ["anchor-syn/idl-build"]
anchor-debug = ["anchor-syn/anchor-debug"]
idl-build = ["anchor-syn/idl-build"]

[dependencies]
anchor-syn = { path = "../../syn", version = "0.28.0" }
Expand Down
7 changes: 3 additions & 4 deletions lang/derive/accounts/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,11 @@ proc-macro = true

[features]
allow-missing-optionals = ["anchor-syn/allow-missing-optionals"]
init-if-needed = ["anchor-syn/init-if-needed"]
default = []
idl-build = ["anchor-syn/idl-build"]
anchor-debug = ["anchor-syn/anchor-debug"]
idl-build = ["anchor-syn/idl-build"]
init-if-needed = ["anchor-syn/init-if-needed"]

[dependencies]
anchor-syn = { path = "../../syn", version = "0.28.0" }
quote = "1"
syn = { version = "1", features = ["full"] }
anchor-syn = { path = "../../syn", version = "0.28.0" }
4 changes: 1 addition & 3 deletions lang/derive/serde/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ edition = "2021"
proc-macro = true

[features]
idl-build = [
"anchor-syn/idl-build",
]
idl-build = ["anchor-syn/idl-build"]

[dependencies]
anchor-syn = { path = "../../syn", version = "0.28.0" }
Expand Down
2 changes: 1 addition & 1 deletion lang/derive/space/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ proc-macro = true
[dependencies]
proc-macro2 = "1"
quote = "1"
syn = { version = "1", features = ["extra-traits"]}
syn = { version = "1", features = ["extra-traits"] }
1 change: 0 additions & 1 deletion lang/syn/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ rust-version = "1.60"
edition = "2021"

[features]
default = []
allow-missing-optionals = []
anchor-debug = []
event-cpi = []
Expand Down
14 changes: 7 additions & 7 deletions spl/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ license = "Apache-2.0"
description = "CPI clients for SPL programs"

[features]
default = ["mint", "token", "token_2022", "associated_token"]
mint = []
token = ["spl-token"]
token_2022 = ["spl-token-2022"]
default = ["associated_token", "mint", "token", "token_2022"]
associated_token = ["spl-associated-token-account"]
dex = ["serum_dex"]
devnet = []
governance = []
metadata = ["mpl-token-metadata"]
mint = []
shmem = []
stake = ["borsh"]
devnet = []
metadata = ["mpl-token-metadata"]
dex = ["serum_dex"]
token = ["spl-token"]
token_2022 = ["spl-token-2022"]

[dependencies]
anchor-lang = { path = "../lang", version = "0.28.0", features = ["derive"] }
Expand Down

0 comments on commit abfdc4e

Please sign in to comment.