Skip to content

Commit

Permalink
temporarily pin clap and anstyle dependencies (#190)
Browse files Browse the repository at this point in the history
This commit temporarily pins the clap dependency version to v4.3.24, since v4.4 changed Clap's MSRV to Rust 1.70, which our dev image doesn't have yet. It was also necessary to add an explicit dep on anstyle, a transitive dep via clap, so that we could pin that crate to v1.0.0, as v1.0.1 of anstyle also requires Rust 1.70
  • Loading branch information
hawkw authored Oct 20, 2023
1 parent 4668369 commit 7b47e77
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 2 deletions.
4 changes: 3 additions & 1 deletion examples/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ chrono = { version = "0.4", default-features = false }
futures = { version = "0.3", default-features = false }
maplit = "1"
rand = "0.8"
regex = "1"
# this is pinned to avoid a dep on `regex-syntax` v0.8.x, which requires Rust
# >1.65 (where we only have 1.64).
regex = "=1.9.6"
thiserror = "1"
tracing = "0.1"
tracing-subscriber = { version = "0.3", features = ["ansi", "env-filter"] }
Expand Down
17 changes: 16 additions & 1 deletion kubert/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@ client = [
"tower-http",
"hyper",
]
clap = [
"anstyle",
"clap_lex",
"dep:clap",
]
errors = [
"futures-core",
"futures-util",
Expand Down Expand Up @@ -124,6 +129,10 @@ features = ["k8s-openapi/v1_27"]

[dependencies]
ahash = { version = "0.8", optional = true }
# dependency of clap, which we must take an explicit dep on to ensure that it's
# pinned to the version before the MSRV became incompatible with what's in the
# devcontainer.
anstyle = { version = "=1.0.0", optional = true }
backoff = { version = "0.4", features = ["tokio"], optional = true }
boring = { version = "3.0.4", optional = true }
bytes = { version = "1", optional = true }
Expand All @@ -132,6 +141,10 @@ deflate = { version = "1", optional = true, default-features = false, features =
] }
drain = { version = "0.1.1", optional = true, default-features = false }
chrono = { version = "0.4", optional = true, default-features = false }
# dependency of clap, which we must take an explicit dep on to ensure that it's
# pinned to the version before the MSRV became incompatible with what's in the
# devcontainer.
clap_lex = { version = "=0.5.0", optional = true }
futures-core = { version = "0.3", optional = true, default-features = false }
futures-util = { version = "0.3", optional = true, default-features = false }
hyper = { version = "0.14.17", optional = true, default-features = false }
Expand All @@ -156,7 +169,9 @@ tower = { version = "0.4", default-features = false, optional = true }
tracing = { version = "0.1.31", optional = true }

[dependencies.clap]
version = "4"
# temporarily pin to the version before the MSRV became 1.70, since Rust 1.70 is
# newer than what's in our devcontainer.
version = "=4.3.24"
optional = true
default-features = false
features = ["derive", "std"]
Expand Down

0 comments on commit 7b47e77

Please sign in to comment.