Skip to content

Commit d8c407a

Browse files
authored
Make Cargo.toml feature pins compatible with project/main (TraceMachina#1212)
A fix outlined here: ToBinio/cargo-features-manager#37 This change is to make nativelink compatible with those changes.
1 parent 19f4483 commit d8c407a

File tree

14 files changed

+10
-296
lines changed

14 files changed

+10
-296
lines changed

Cargo.lock

-175
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+5-1
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,12 @@ opentelemetry-prometheus = "0.16.0"
6565
serde_json = "1.0.120"
6666

6767
[workspace.cargo-features-manager.keep]
68+
aws-sdk-s3 = ["rt-tokio"]
69+
aws-smithy-runtime = ["test-util"]
6870
# This causes blake3 to detect SIMD capabilities at runtime.
6971
blake3 = ["std"]
70-
serial_test = ["async"]
7172
pretty_assertions = ["std"]
73+
redis-test = ["aio"]
74+
serial_test = ["async"]
75+
tokio = ["signal"]
7276
tonic-build = ["prost"]

nativelink-config/Cargo.toml

-3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,3 @@ shellexpand = { version = "3.1.0", default-features = false, features = ["base-0
1212

1313
[dev-dependencies]
1414
pretty_assertions = { version = "1.4.0", features = ["std"] }
15-
16-
[cargo-features-manager.keep]
17-
pretty_assertions = ["std"]

nativelink-proto/Cargo.toml

+1-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,4 @@ tonic = { version = "0.12.0", default-features = false }
2525

2626
[dev-dependencies]
2727
prost-build = { version = "0.13.1", default-features = false }
28-
tonic-build = { version = "0.12.0", features = ["prost"] }
29-
30-
[cargo-features-manager.keep]
31-
tonic-build = ["prost"]
28+
tonic-build = { version = "0.12.0", features = ["prost"], default-features = false }

0 commit comments

Comments
 (0)