Skip to content

Update dependencies. #202

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
TheJokr merged 1 commit into from
Apr 27, 2026
+80 −76
Merged

Update dependencies. #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
143 changes: 73 additions & 70 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,85 +36,88 @@ check-cfg = [
]

[workspace.dependencies]
anyhow = "1.0.75"
backtrace = "0.3"
anyhow = "1.0.102"
backtrace = "0.3.76"
foundations = { version = "5.6.5", path = "./foundations" }
foundations-macros = { version = "=5.6.5", path = "./foundations-macros", default-features = false }
bindgen = { version = "0.72", default-features = false }
cc = "1.0"
cf-rustracing = "1.3"
cf-rustracing-jaeger = "1.3"
clap = "4.4"
crossbeam-utils = { version = "0.8", default-features = false }
darling = "0.23"
erased-serde = "0.4"
futures-util = "0.3"
governor = "0.10"
http = "1.1.0"
http-body-util = "0.1"
hyper = { version = "1", default-features = false }
hyper-util = { version = "0.1", default-features = false }
indexmap = "2.0"
ipnetwork = { version = "0.21", features = ["serde"] }
libc = "0.2"
once_cell = "1.5"
tonic = { version = "0.14", default-features = false }
tonic-prost = { version = "0.14" }
opentelemetry-proto = "0.31"
parking_lot = "0.12"
pin-project-lite = "0.2.16"
proc-macro2 = { version = "1", default-features = false }
prometheus = { version = "0.14", default-features = false }
prometheus-client = "0.18"
bindgen = { version = "0.72.1", default-features = false }
cc = "1.2.61"
cf-rustracing = "1.3.0"
cf-rustracing-jaeger = "1.3.0"
clap = "4.6.1"
crossbeam-utils = { version = "0.8.21", default-features = false }
darling = "0.23.0"
erased-serde = "0.4.10"
futures-util = "0.3.32"
governor = "0.10.4"
http = "1.4.0"
http-body-util = "0.1.3"
hyper = { version = "1.9.0", default-features = false }
hyper-util = { version = "0.1.20", default-features = false }
indexmap = "2.14.0"
ipnetwork = { version = "0.21.1", features = ["serde"] }
libc = "0.2.186"
nix = "0.31.2"
once_cell = "1.21.4"
tonic = { version = "0.14.5", default-features = false }
tonic-prost = "0.14.5"
opentelemetry-proto = "0.31.0"
parking_lot = "0.12.5"
pin-project-lite = "0.2.17"
proc-macro2 = { version = "1.0.106", default-features = false }
prometheus = { version = "0.14.0", default-features = false }
prometheus-client = "0.18.1"
prometools = "0.2.3"
rand = "0.10"
percent-encoding = "2.3"
quote = "1"
regex = "1.8"
reqwest = { version = "0.12", default-features = false }
socket2 = { version = "0.6", features = ["all"] }
syn = "2"
serde = "1.0.198"
serde_json = "1.0"
serde_path_to_error = "0.1.17"
serde-saphyr = { version = "0.0.22", default-features = false }
rand = "0.10.1"
percent-encoding = "2.3.2"
quote = "1.0.45"
regex = "1.12.3"
reqwest = { version = "0.13.2", default-features = false }
socket2 = { version = "0.6.3", features = ["all"] }
syn = "2.0.117"
serde = "1.0.228"
serde_json = "1.0.149"
serde_path_to_error = "0.1.20"
serde-saphyr = { version = "0.0.25", default-features = false, features = ["deserialize", "serialize"] }
serde_yaml = "0.8.26"
yaml-merge-keys = { version = "0.5", features = ["serde_yaml"] }
serde_with = "3.3"
slab = "0.4.7"
slog = "2.8"
slog-async = "2.3"
slog-json = "2.3"
slog-term = "2.4"
tempfile = "3.7"
tokio = "1.41.0"
thread_local = "1.1"
tikv-jemallocator = "0.6"
tikv-jemalloc-ctl = "0.6"
tower-service = "0.3"
tracing-slog = "0.3.0"
tracing-subscriber = "0.3"
sentry-core = { version = "0.36", default-features = false }
sentry = { version = "0.36", default-features = false, features = [
yaml-merge-keys = { version = "0.5.1", features = ["serde_yaml"] }
serde_with = "3.18.0"
slab = "0.4.12"
slog = "2.8.2"
slog-async = "2.8.0"
slog-json = "2.6.1"
slog-term = "2.9.2"
tempfile = "3.27.0"
tokio = "1.52.1"
thread_local = "1.1.9"
tikv-jemallocator = "0.6.1"
tikv-jemalloc-ctl = "0.6.1"
tower-service = "0.3.3"
tracing-slog = "0.4.0"
tracing-subscriber = "0.3.23"
sentry-core = { version = "0.36.0", default-features = false }
sentry = { version = "0.36.0", default-features = false, features = [
"backtrace",
"contexts",
"panic",
"ureq",
"rustls",
] }
zeroize = "1.8"
zeroize = "1.8.2"

# needed for minver
ahash = "0.8.7"
annotate-snippets = "0.12.13"
async-stream = "0.3"
encoding_rs_io = "0.1.2"
local-ip-address = "0.6.5"
lock_api = "0.4.7"
log = "0.4.27"
neli = "0.6.5"
neli-proc-macros = "0.1.4"
nix = "0.30"
Comment thread
orium marked this conversation as resolved.
parking_lot_core = "0.9.2"
thiserror = "2.0.12"
tower = "0.5.2"
ahash = "0.8.12"
annotate-snippets = "0.12.15"
# `slog-term` 2.9.2 declares `chrono = "^0.4"` but uses APIs (`fixed_offset`, `to_utc`) added
# in 0.4.33. Without a floor >= 0.4.33, `cargo update -Z minimal-versions` picks chrono 0.4.20
# and the minver CI job fails compiling slog-term.
chrono = "0.4.44"
encoding_rs_io = "0.1.7"
local-ip-address = "0.6.12"
lock_api = "0.4.14"
log = "0.4.29"
neli = "0.7.4"
neli-proc-macros = "0.2.2"
parking_lot_core = "0.9.12"
thiserror = "2.0.18"
tower = "0.5.3"
2 changes: 1 addition & 1 deletion foundations/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ zeroize = { workspace = true, optional = true }
# needed for minver purposes
ahash = { workspace = true, optional = true }
annotate-snippets = { workspace = true, optional = true }
async-stream = { workspace = true, optional = true }
Comment thread
orium marked this conversation as resolved.
chrono = { workspace = true, optional = true }
encoding_rs_io = { workspace = true, optional = true }
local-ip-address = { workspace = true, optional = true }
lock_api = { workspace = true, optional = true }
Expand Down
11 changes: 6 additions & 5 deletions foundations/src/settings/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,12 +429,11 @@ pub fn to_yaml_string(settings: &impl Settings) -> BootstrapResult<String> {

#[cfg(feature = "serde-saphyr")]
let yaml = {
let saphyr_settings = serde_saphyr::SerializerOptions {
let saphyr_settings = serde_saphyr::ser_options! {
empty_as_braces: true,
indent_step: 2,
// Need this so the truncate calculation below doesn't break
compact_list_indent: false,
..Default::default()
};
serde_saphyr::to_string_with_options(settings, saphyr_settings)?
};
Expand Down Expand Up @@ -506,10 +505,9 @@ pub fn to_yaml_file(settings: &impl Settings, path: impl AsRef<Path>) -> Bootstr
pub fn from_yaml_str<T: Settings>(data: impl AsRef<str>) -> BootstrapResult<T> {
#[cfg(feature = "serde-saphyr")]
{
let saphyr_settings = serde_saphyr::Options {
let saphyr_settings = serde_saphyr::options! {
// Prevent leakage of secrets from the raw document in error messages
with_snippet: false,
..Default::default()
};

// NOTE: merge dict key refs handled natively by serde-saphyr
Expand All @@ -525,6 +523,7 @@ pub fn from_yaml_str<T: Settings>(data: impl AsRef<str>) -> BootstrapResult<T> {
},
);

#[allow(clippy::needless_return)]
return match (path_res, saphyr_res) {
Comment thread
TheJokr marked this conversation as resolved.
// serde_path_to_error::Error takes precedence if set
(Some(Err(e)), _) => Err(e.into()),
Expand All @@ -541,7 +540,9 @@ pub fn from_yaml_str<T: Settings>(data: impl AsRef<str>) -> BootstrapResult<T> {
let value: serde_yaml::Value = serde_path_to_error::deserialize(de)?;
// NOTE: merge dict key refs: https://yaml.org/type/merge.html
let value = yaml_merge_keys::merge_keys_serde(value)?;
Ok(serde_path_to_error::deserialize(value)?)

#[allow(clippy::needless_return)]
return Ok(serde_path_to_error::deserialize(value)?);
}
}

Expand Down
Loading