Skip to content

Commit ef7fb0f

Browse files
authored
fix: feature resolution (gakonst#2274)
* fix: feature resolution * docs: add comment explaining resolver
1 parent 1dc5d40 commit ef7fb0f

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

Cargo.toml

+10-6
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ default-members = [
5858
"ethers-solc",
5959
]
6060

61+
# Explicitly set the resolver to version 2, which is the default for packages with edition >= 2021
62+
# https://doc.rust-lang.org/edition-guide/rust-2021/default-cargo-resolver.html
63+
resolver = "2"
64+
6165
[workspace.dependencies]
6266
# workspace crates
6367
ethers = { version = "2.0.0", path = "ethers", default-features = false }
@@ -77,11 +81,11 @@ ethers-derive-eip712 = { version = "2.0.0", path = "ethers-core/ethers-derive-ei
7781
# async / async utils
7882
tokio = "1.26"
7983
tokio-tungstenite = { version = "0.18.0", default-features = false }
80-
futures = { version = "0.3.27", default-features = false }
81-
futures-core = { version = "0.3.27", default-features = false }
82-
futures-util = { version = "0.3.27", default-features = false }
83-
futures-executor = { version = "0.3.27", default-features = false }
84-
futures-channel = { version = "0.3.27", default-features = false }
84+
futures = { version = "0.3.27", default-features = false, features = ["std"] }
85+
futures-core = "0.3.27"
86+
futures-util = "0.3.27"
87+
futures-executor = "0.3.27"
88+
futures-channel = "0.3.27"
8589
futures-locks = { version = "0.7.1", default-features = false }
8690
futures-timer = { version = "3.0.2", default-features = false, features = ["wasm-bindgen"] }
8791
pin-project = "1.0"
@@ -103,7 +107,7 @@ serde_json = "1.0"
103107
# macros
104108
proc-macro2 = "1.0"
105109
quote = "1.0"
106-
syn = "1.0"
110+
syn = { version = "1.0", features = ["extra-traits"] }
107111
async-trait = "0.1.66"
108112
auto_impl = "1.0"
109113

ethers-contract/ethers-contract-abigen/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ ethers-core = { workspace = true, features = ["macros"] }
3030

3131
proc-macro2.workspace = true
3232
quote.workspace = true
33-
syn = { workspace = true, features = ["full"] }
33+
syn.workspace = true
3434
prettyplease = "0.1.25"
3535

3636
Inflector = "0.11"

0 commit comments

Comments
 (0)