Skip to content

mark few deps as optional, which is used only from some features #3774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rami3l merged 2 commits into from
Apr 14, 2024
Merged

mark few deps as optional, which is used only from some features #3774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ec7ed3
tracing unsed only from otel feature, so move it to optional
klensy Apr 14, 2024
e1caa5c
once_cell only used with reqwest in download crate, so gate it
klensy Apr 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ otel = [
"dep:opentelemetry",
"dep:opentelemetry_sdk",
"dep:tokio",
"dep:tracing",
]

# Exports code dependent on private interfaces for the integration test suite
Expand Down Expand Up @@ -92,7 +93,7 @@ tokio = { workspace = true, optional = true }
toml = "0.8"
tracing-opentelemetry = { workspace = true, optional = true }
tracing-subscriber = { workspace = true, optional = true, features = ["env-filter"] }
tracing.workspace = true
tracing = { workspace = true, optional = true }
url.workspace = true
wait-timeout = "0.2"
walkdir = { workspace = true, optional = true }
Expand Down
6 changes: 3 additions & 3 deletions download/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ default = ["reqwest-backend", "reqwest-rustls-tls", "reqwest-default-tls"]

curl-backend = ["curl"]
reqwest-backend = ["reqwest", "env_proxy"]
reqwest-default-tls = ["reqwest/default-tls"]
reqwest-rustls-tls = ["reqwest/rustls-tls-native-roots"]
reqwest-default-tls = ["reqwest/default-tls", "dep:once_cell"]
reqwest-rustls-tls = ["reqwest/rustls-tls-native-roots", "dep:once_cell"]

[dependencies]
anyhow.workspace = true
curl = { version = "0.4.44", optional = true }
env_proxy = { version = "0.4.1", optional = true }
once_cell.workspace = true
once_cell = { workspace = true, optional = true }
reqwest = { version = "0.12", default-features = false, features = ["blocking", "gzip", "socks"], optional = true }
thiserror.workspace = true
url.workspace = true
Expand Down
⚡