Skip to content

Commit fec2064

Browse files
authored
chore: remove rustls/openssl features (foundry-rs#9824)
1 parent be5e714 commit fec2064

File tree

13 files changed

+15
-143
lines changed

13 files changed

+15
-143
lines changed

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env:
1414
CARGO_TERM_COLOR: always
1515
IS_NIGHTLY: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
1616
PROFILE: maxperf
17-
STABLE_VERSION: 'v0.3.0'
17+
STABLE_VERSION: "v0.3.0"
1818

1919
jobs:
2020
prepare:
@@ -148,7 +148,7 @@ jobs:
148148
run: |
149149
set -eo pipefail
150150
flags=(--target $TARGET --profile $PROFILE --bins
151-
--no-default-features --features rustls,aws-kms,cli,asm-keccak)
151+
--no-default-features --features aws-kms,cli,asm-keccak)
152152
153153
# `jemalloc` is not fully supported on MSVC or aarch64 Linux.
154154
if [[ "$TARGET" != *msvc* && "$TARGET" != "aarch64-unknown-linux-gnu" ]]; then
@@ -278,7 +278,7 @@ jobs:
278278
issue:
279279
name: Open an issue
280280
runs-on: ubuntu-latest
281-
needs: [ prepare, release-docker, release, cleanup ]
281+
needs: [prepare, release-docker, release, cleanup]
282282
if: failure()
283283
steps:
284284
- uses: actions/checkout@v4

.github/workflows/test.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,6 @@ jobs:
113113

114114
deny:
115115
uses: ithacaxyz/ci/.github/workflows/deny.yml@main
116-
with:
117-
# Clear out arguments to not pass `--all-features` to `cargo deny`.
118-
# Many crates have an `openssl` feature which enables banned dependencies.
119-
deny-flags: ""
120116

121117
ci-success:
122118
runs-on: ubuntu-latest

Cargo.lock

Lines changed: 0 additions & 99 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,10 @@ proptest = "1"
292292
rand = "0.8"
293293
rayon = "1"
294294
regex = { version = "1", default-features = false }
295-
reqwest = { version = "0.12", default-features = false }
295+
reqwest = { version = "0.12", default-features = false, features = [
296+
"rustls-tls",
297+
"rustls-tls-native-roots",
298+
] }
296299
semver = "1"
297300
serde = { version = "1.0", features = ["derive"] }
298301
serde_json = { version = "1.0", features = ["arbitrary_precision"] }

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ CARGO_TARGET_DIR ?= target
1313
# List of features to use when building. Can be overridden via the environment.
1414
# No jemalloc on Windows
1515
ifeq ($(OS),Windows_NT)
16-
FEATURES ?= rustls aws-kms cli asm-keccak
16+
FEATURES ?= aws-kms cli asm-keccak
1717
else
18-
FEATURES ?= jemalloc rustls aws-kms cli asm-keccak
18+
FEATURES ?= jemalloc aws-kms cli asm-keccak
1919
endif
2020

2121
##@ Help

crates/cast/Cargo.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,7 @@ async-trait.workspace = true
9393
divan.workspace = true
9494

9595
[features]
96-
default = ["rustls", "jemalloc"]
97-
rustls = ["foundry-cli/rustls", "foundry-wallets/rustls"]
98-
openssl = ["foundry-cli/openssl"]
96+
default = ["jemalloc"]
9997
asm-keccak = ["alloy-primitives/asm-keccak"]
10098
jemalloc = ["dep:tikv-jemallocator"]
10199
aws-kms = ["foundry-wallets/aws-kms", "dep:aws-sdk-kms"]

crates/chisel/Cargo.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,6 @@ serial_test = "3"
6565
tracing-subscriber.workspace = true
6666

6767
[features]
68-
default = ["rustls", "jemalloc"]
69-
rustls = ["reqwest/rustls-tls", "reqwest/rustls-tls-native-roots"]
70-
openssl = ["foundry-compilers/openssl", "reqwest/default-tls"]
68+
default = ["jemalloc"]
7169
asm-keccak = ["alloy-primitives/asm-keccak"]
7270
jemalloc = ["dep:tikv-jemallocator"]

crates/cli/Cargo.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,4 @@ tracing-tracy = { version = "0.11", optional = true }
5454
tempfile.workspace = true
5555

5656
[features]
57-
default = ["rustls"]
58-
rustls = ["foundry-wallets/rustls"]
59-
openssl = ["foundry-compilers/openssl"]
60-
6157
tracy = ["dep:tracing-tracy"]

crates/common/Cargo.toml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,10 @@ terminal_size.workspace = true
7171

7272
[build-dependencies]
7373
chrono.workspace = true
74-
vergen = { workspace = true, features = [
75-
"build",
76-
"git",
77-
"gitcl",
78-
] }
74+
vergen = { workspace = true, features = ["build", "git", "gitcl"] }
7975

8076
[dev-dependencies]
8177
foundry-macros.workspace = true
8278
similar-asserts.workspace = true
8379
tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
84-
axum = { workspace = true }
80+
axum = { workspace = true }

crates/config/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,4 @@ figment = { workspace = true, features = ["test"] }
5555
tempfile.workspace = true
5656

5757
[features]
58-
default = ["rustls"]
59-
rustls = ["reqwest/rustls-tls-native-roots"]
6058
isolate-by-default = []

0 commit comments

Comments
 (0)