Skip to content

Commit 7dba6fa

Browse files
chore: Avoid 'fips' getting enabled for the workspace hack crate
1 parent 2b44721 commit 7dba6fa

File tree

4 files changed

+24
-8
lines changed

4 files changed

+24
-8
lines changed

.config/hakari.toml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,11 @@ platforms = [
2323

2424
# Write out exact versions rather than a semver range. (Defaults to false.)
2525
# exact-versions = true
26+
27+
[traversal-excludes]
28+
third-party = [
29+
# We don't want the `fips` feature to be enabled, but `hakari` doesn't
30+
# allow us to exclude individual features. Therefore we must exclude
31+
# `rustls` entirely.
32+
{ name = "rustls" }
33+
]

Cargo.lock

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

docs/examples/workspace_hack/Cargo.toml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,40 @@ publish = false
1616
### BEGIN HAKARI SECTION
1717
[dependencies]
1818
futures-core = { version = "0.3" }
19+
getrandom = { version = "0.2", default-features = false, features = ["std"] }
20+
log = { version = "0.4", default-features = false, features = ["std"] }
1921
memchr = { version = "2" }
22+
once_cell = { version = "1" }
2023
percent-encoding = { version = "2" }
2124
proc-macro2 = { version = "1", features = ["span-locations"] }
2225
quote = { version = "1" }
2326
reqwest = { version = "0.12", features = ["json", "rustls-tls"] }
27+
rustls = { version = "0.23", default-features = false, features = ["logging", "ring", "std", "tls12"] }
2428
serde = { version = "1", features = ["alloc", "derive", "rc"] }
2529
serde_core = { version = "1", features = ["alloc", "rc"] }
2630
serde_json = { version = "1", features = ["raw_value", "unbounded_depth"] }
2731
smallvec = { version = "1", default-features = false, features = ["const_new", "serde"] }
2832
stable_deref_trait = { version = "1" }
33+
subtle = { version = "2" }
2934
syn = { version = "2", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] }
3035

3136
[build-dependencies]
3237
futures-core = { version = "0.3" }
38+
getrandom = { version = "0.2", default-features = false, features = ["std"] }
39+
log = { version = "0.4", default-features = false, features = ["std"] }
3340
memchr = { version = "2" }
41+
once_cell = { version = "1" }
3442
percent-encoding = { version = "2" }
3543
proc-macro2 = { version = "1", features = ["span-locations"] }
3644
quote = { version = "1" }
3745
reqwest = { version = "0.12", features = ["json", "rustls-tls"] }
46+
rustls = { version = "0.23", default-features = false, features = ["logging", "ring", "std", "tls12"] }
3847
serde = { version = "1", features = ["alloc", "derive", "rc"] }
3948
serde_core = { version = "1", features = ["alloc", "rc"] }
4049
serde_json = { version = "1", features = ["raw_value", "unbounded_depth"] }
4150
smallvec = { version = "1", default-features = false, features = ["const_new", "serde"] }
4251
stable_deref_trait = { version = "1" }
52+
subtle = { version = "2" }
4353
syn = { version = "2", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] }
4454

4555
### END HAKARI SECTION

px_workspace_hack/Cargo.toml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@ rand_core = { version = "0.6", default-features = false, features = ["std"] }
6464
regex-automata = { version = "0.4", default-features = false, features = ["dfa-build", "dfa-onepass", "hybrid", "meta", "nfa", "perf", "std", "unicode"] }
6565
regex-syntax = { version = "0.8" }
6666
reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] }
67-
rustls = { version = "0.23", default-features = false, features = ["fips", "logging", "ring", "std", "tls12"] }
68-
rustls-webpki = { version = "0.103", default-features = false, features = ["aws-lc-rs-fips", "ring", "std"] }
67+
rustls-pki-types = { version = "1", features = ["std"] }
6968
serde = { version = "1", features = ["alloc", "derive", "rc"] }
7069
serde_core = { version = "1", features = ["alloc", "rc"] }
7170
serde_json = { version = "1", features = ["raw_value", "unbounded_depth"] }
@@ -93,13 +92,13 @@ tracing-core = { version = "0.1" }
9392
tracing-log = { version = "0.2" }
9493
uuid = { version = "1", features = ["fast-rng", "serde", "v4", "v7"] }
9594
winnow = { version = "0.7" }
95+
zeroize = { version = "1" }
9696

9797
[build-dependencies]
9898
ahash = { version = "0.8" }
9999
aho-corasick = { version = "1" }
100100
base64 = { version = "0.22" }
101101
byteorder = { version = "1" }
102-
cc = { version = "1", default-features = false, features = ["parallel"] }
103102
clap = { version = "4", features = ["derive", "env"] }
104103
clap_builder = { version = "4", default-features = false, features = ["color", "env", "help", "std", "suggestions", "usage"] }
105104
console = { version = "0.16" }
@@ -143,8 +142,7 @@ rand_core = { version = "0.6", default-features = false, features = ["std"] }
143142
regex-automata = { version = "0.4", default-features = false, features = ["dfa-build", "dfa-onepass", "hybrid", "meta", "nfa", "perf", "std", "unicode"] }
144143
regex-syntax = { version = "0.8" }
145144
reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] }
146-
rustls = { version = "0.23", default-features = false, features = ["fips", "logging", "ring", "std", "tls12"] }
147-
rustls-webpki = { version = "0.103", default-features = false, features = ["aws-lc-rs-fips", "ring", "std"] }
145+
rustls-pki-types = { version = "1", features = ["std"] }
148146
serde = { version = "1", features = ["alloc", "derive", "rc"] }
149147
serde_core = { version = "1", features = ["alloc", "rc"] }
150148
serde_json = { version = "1", features = ["raw_value", "unbounded_depth"] }
@@ -174,5 +172,6 @@ tracing-core = { version = "0.1" }
174172
tracing-log = { version = "0.2" }
175173
uuid = { version = "1", features = ["fast-rng", "serde", "v4", "v7"] }
176174
winnow = { version = "0.7" }
175+
zeroize = { version = "1" }
177176

178177
### END HAKARI SECTION

0 commit comments

Comments
 (0)