Skip to content

Commit 091fcdc

Browse files
committed
Update deps with minimal changes
1 parent 5f86979 commit 091fcdc

File tree

6 files changed

+53
-46
lines changed

6 files changed

+53
-46
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jobs:
9898
uses: dtolnay/rust-toolchain@stable
9999
- uses: Swatinem/rust-cache@v2
100100
- name: Run cargo deny checks
101-
uses: EmbarkStudios/cargo-deny-action@v1
101+
uses: EmbarkStudios/cargo-deny-action@v2
102102
with:
103103
command: check
104104

@@ -150,7 +150,7 @@ jobs:
150150
name: Check feature combinations
151151
strategy:
152152
matrix:
153-
os: [ ubuntu-latest, macos-latest ]
153+
os: [ubuntu-latest, macos-latest]
154154
runs-on: ${{ matrix.os }}
155155
steps:
156156
- uses: actions/checkout@v4

Cargo.toml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -27,63 +27,63 @@ debug = 1
2727
anyhow = "1.0.75"
2828
foundations = { version = "4.5.0", path = "./foundations" }
2929
foundations-macros = { version = "4.5.0", path = "./foundations-macros", default-features = false }
30-
bindgen = { version = "0.68.1", default-features = false }
30+
bindgen = { version = "0.72", default-features = false }
3131
cc = "1.0"
3232
cf-rustracing = "1.1"
33-
cf-rustracing-jaeger = "1.1"
33+
cf-rustracing-jaeger = "1.2"
3434
clap = "4.4"
35-
darling = "0.20.10"
36-
erased-serde = "0.3.28"
37-
futures-util = "0.3.28"
35+
darling = "0.20"
36+
erased-serde = "0.4"
37+
futures-util = "0.3"
3838
governor = "0.6"
3939
http = "1"
4040
http-body-util = "0.1"
4141
hyper = { version = "1", default-features = false }
4242
hyper-util = { version = "0.1", default-features = false }
43-
indexmap = "2.0.0"
44-
ipnetwork = "0.20"
43+
indexmap = "2.0"
44+
ipnetwork = { version = "0.21", features = ["serde"] }
4545
libc = "0.2"
4646
once_cell = "1.5"
4747
tonic = { version = "0.12", default-features = false }
4848
opentelemetry-proto = "0.7"
49-
parking_lot = "0.12.1"
49+
parking_lot = "0.12"
5050
proc-macro2 = { version = "1", default-features = false }
51-
prometheus = { version = "0.13.3", default-features = false }
52-
prometheus-client = "0.18.1"
53-
prometools = "0.2.1"
54-
rand = "0.8"
55-
percent-encoding = "2.3.1"
51+
prometheus = { version = "0.14", default-features = false }
52+
prometheus-client = "0.18"
53+
prometools = "0.2"
54+
rand = "0.9"
55+
percent-encoding = "2.3"
5656
quote = "1"
5757
regex = "1.8"
5858
reqwest = { version = "0.12", default-features = false }
59-
socket2 = { version = "0.5.3", features = ["all"] }
59+
socket2 = { version = "0.5", features = ["all"] }
6060
syn = "2"
6161
serde = "1"
62-
serde_path_to_error = "0.1.15"
63-
serde_yaml = "0.8.26"
64-
serde_with = "3.3.0"
65-
slab = "0.4.9"
62+
serde_path_to_error = "0.1"
63+
serde_yaml = "0.8"
64+
serde_with = "3.3"
65+
slab = "0.4"
6666
slog = "2.7"
6767
slog-async = "2.3"
6868
slog-json = "2.3"
6969
slog-term = "2.4"
7070
tempfile = "3.7"
7171
tokio = "1.41.0"
7272
thread_local = "1.1"
73-
tikv-jemallocator = "0.5"
74-
tikv-jemalloc-ctl = "0.5"
73+
tikv-jemallocator = "0.6"
74+
tikv-jemalloc-ctl = "0.6"
7575
tower-service = "0.3"
7676
tracing-slog = "0.3.0"
7777
tracing-subscriber = "0.3"
78-
yaml-merge-keys = "0.5"
78+
yaml-merge-keys = { version = "0.5", features = ["serde_yaml"] }
7979

8080
# needed for minver
81-
async-stream = "0.3.5"
82-
local-ip-address = "0.5.7"
83-
lock_api = "0.4.11"
84-
log = "0.4.20"
85-
neli = "0.6.4"
86-
neli-proc-macros = "0.1.3"
87-
nix = "0.29.0"
88-
parking_lot_core = "0.9.9"
89-
thiserror = "1.0.56"
81+
async-stream = "0.3"
82+
local-ip-address = "0.6.5"
83+
lock_api = "0.4"
84+
log = "0.4.27"
85+
neli = "0.6.5"
86+
neli-proc-macros = "0.1.4"
87+
nix = "0.30"
88+
parking_lot_core = "0.9"
89+
thiserror = "2.0.12"

deny.toml

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
[advisories]
2-
vulnerability = "deny"
3-
unmaintained = "allow"
4-
notice = "allow"
5-
unsound = "deny"
6-
severity-threshold = "medium"
2+
unmaintained = "all"
73
ignore = [
84
# No fix available, but only applies to Windows, hence not a problem for us.
95
"RUSTSEC-2021-0145",
6+
# NOTE: paste which is unmaintained, but
7+
# is a dependency of tykv-jemalloc-sys
8+
"RUSTSEC-2024-0436",
9+
# serde_yaml is unmaintained
10+
"RUSTSEC-2024-0320",
1011
]
1112

1213

@@ -24,8 +25,14 @@ unknown-git = "allow"
2425
allow-git = []
2526

2627
[licenses]
27-
unlicensed = "allow"
28-
allow-osi-fsf-free = "either"
29-
copyleft = "deny"
30-
allow = ["MPL-2.0"]
31-
confidence-threshold = 0.9
28+
private.ignore = true
29+
unused-allowed-license = "allow"
30+
# Licences should be at least osi or fsf-free
31+
# and not copyleft
32+
allow = [
33+
"MIT",
34+
"Apache-2.0",
35+
"BSD-3-Clause",
36+
"Unicode-3.0",
37+
"ISC",
38+
]

foundations/build.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ fn ensure_seccomp_sources_fetched() {
2424
#[cfg(feature = "security")]
2525
mod security {
2626
use super::*;
27-
use bindgen::{Builder, CargoCallbacks};
27+
use bindgen::Builder;
2828
use std::fs;
2929
use std::path::Path;
3030

@@ -175,7 +175,7 @@ mod security {
175175
.allowlist_var("PR_GET_SECCOMP")
176176
.allowlist_var("PR_SET_NAME")
177177
.derive_default(true)
178-
.parse_callbacks(Box::new(CargoCallbacks))
178+
.parse_callbacks(Box::new(bindgen::CargoCallbacks::new()))
179179
.generate()
180180
.unwrap()
181181
.write_to_file(out_dir.join("security_sys.rs"))

foundations/src/telemetry/tracing/internal.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,5 +211,5 @@ fn should_sample(sampling_ratio: f64) -> bool {
211211
return true;
212212
}
213213

214-
rand::thread_rng().gen_range(0.0..1.0) < sampling_ratio
214+
rand::rng().random_range(0.0..1.0) < sampling_ratio
215215
}

foundations/tests/settings.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ struct StructWithCrateReexport {
155155
macro_rules! assert_ser_eq {
156156
($obj:expr, $expected:expr) => {
157157
let actual = to_yaml_string(&$obj).unwrap().trim().to_string();
158-
let expected = include_str!($expected);
158+
let expected = include_str!($expected).trim();
159159

160160
assert_eq!(
161161
actual, expected,

0 commit comments

Comments
 (0)