Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
61 changes: 26 additions & 35 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 9 additions & 10 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,13 @@ const_format = "0.2.36"
# Unblocked once rsa 0.10 (currently at 0.10.0-rc.18) is released: https://github.com/RustCrypto/RSA
# See also the ecdsa, p256, rand_core, sha2, signature and x509-cert pins below.
const-oid = { version = "0.9.6", features = ["db"] }
convert_case = "0.11.0"
convert_case_extras = "0.2.0"
convert_case = "0.12.0"
darling = "0.24.0"
delegate = "0.13.5"
dockerfile-parser = "0.9.0"
# Pinned to the old RustCrypto generation, see the const-oid comment above.
ecdsa = { version = "0.16.9", features = ["digest", "pem"] }
educe = { version = "0.7.6", default-features = false, features = ["Clone", "Debug", "Default", "PartialEq", "Eq"] }
educe = { version = "0.8.1", default-features = false, features = ["Clone", "Debug", "Default", "PartialEq", "Eq"] }
either = "1.17.0"
futures = "0.3.33"
futures-util = "0.3.33"
Expand All @@ -54,11 +53,11 @@ k8s-openapi = { version = "0.28.0", default-features = false, features = ["schem
# We use ring instead of aws-lc-rs, as this currently fails to build in "make run-dev"
kube = { version = "4.2.0", default-features = false, features = ["client", "jsonpatch", "runtime", "derive", "admission", "rustls-tls", "ring"] }
local-ip-address = "0.6.13"
opentelemetry = "0.32.0"
opentelemetry_sdk = { version = "0.32.1", features = ["rt-tokio"] }
opentelemetry-appender-tracing = "0.32.0"
opentelemetry-otlp = "0.32.0"
opentelemetry-semantic-conventions = "0.32.1"
opentelemetry = "0.33.0"
opentelemetry_sdk = { version = "0.33.0", features = ["rt-tokio"] }
opentelemetry-appender-tracing = "0.33.0"
opentelemetry-otlp = "0.33.0"
opentelemetry-semantic-conventions = "0.33.0"
# Pinned to the old RustCrypto generation, see the const-oid comment above.
p256 = { version = "0.13.2", features = ["ecdsa"] }
paste = "1.0.15"
Expand All @@ -73,7 +72,7 @@ rand = "0.10.2"
rand_core = "0.6.4"
regex = "1.13.1"
rsa = { version = "0.9.10", features = ["sha2"] }
rstest = "0.26.1"
rstest = "0.27.0"
rstest_reuse = "0.7.0"
schemars = { version = "1.2.2", features = ["url2"] }
semver = "1.0.28"
Expand All @@ -100,7 +99,7 @@ tower = { version = "0.5.3", features = ["util"] }
tower-http = { version = "0.7.0", features = ["trace"] } # We don't actually use this crate, but we need to enable the `trace` feature
tracing = "0.1.44"
tracing-appender = "0.2.5"
tracing-opentelemetry = "0.33.0"
tracing-opentelemetry = "0.34.0"
tracing-subscriber = { version = "0.3.23", features = ["env-filter", "json"] }
trybuild = "1.0.120"
url = { version = "2.5.8", features = ["serde"] }
Expand Down
1 change: 0 additions & 1 deletion crates/stackable-versioned-macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ proc-macro = true
k8s-version = { path = "../k8s-version", features = ["darling"] }

convert_case.workspace = true
convert_case_extras.workspace = true
darling.workspace = true
indoc.workspace = true
itertools.workspace = true
Expand Down
12 changes: 10 additions & 2 deletions crates/stackable-versioned-macros/src/attrs/item/variant.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
use convert_case::Case;
use convert_case_extras::is_case;
use convert_case::{Case, Casing};
use darling::{Error, FromVariant, Result};
use syn::{Attribute, Ident};

Expand Down Expand Up @@ -75,3 +74,12 @@ impl VariantAttributes {
self.common.validate_versions(versions)
}
}

// We don't want to take a dependency on the (unmaintained[1]) `convert_case_extras` crate just for
// this function, so we vendor it from
// https://github.com/rutrum/convert-case-extras/blob/fe00fabaa00f065e254c675a28cadb4d0f6e1400/src/lib.rs#L36
//
// [1]: https://github.com/rutrum/convert-case-extras/issues/1
fn is_case<T: AsRef<str>>(s: T, case: Case) -> bool {
s.as_ref() == s.as_ref().to_case(case)
}
Loading