Skip to content

Commit

Permalink
chore: update dependencies (#1040)
Browse files Browse the repository at this point in the history
  • Loading branch information
XAMPPRocky authored Nov 21, 2024
1 parent 9eeb0e8 commit 5953b80
Show file tree
Hide file tree
Showing 9 changed files with 879 additions and 604 deletions.
1,347 changes: 810 additions & 537 deletions Cargo.lock

Large diffs are not rendered by default.

94 changes: 47 additions & 47 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -90,19 +90,19 @@ arc-swap.workspace = true
async-channel.workspace = true
async-stream.workspace = true
base64.workspace = true
base64-serde = "0.7.0"
bytes = { version = "1.5.0", features = ["serde"] }
base64-serde = "0.8.0"
bytes = { version = "1.8.0", features = ["serde"] }
cached.workspace = true
crossbeam-utils = { version = "0.8", optional = true }
clap = { version = "4.4.6", features = ["cargo", "derive", "env"] }
dashmap = { version = "5.5", features = ["serde"] }
either = "1.9.0"
clap = { version = "4.5.21", features = ["cargo", "derive", "env"] }
dashmap = { version = "6.1", features = ["serde"] }
either = "1.13.0"
enum-map.workspace = true
eyre.workspace = true
fixedstr.workspace = true
futures.workspace = true
http-body-util = "0.1"
hyper = { version = "1.3", features = ["http2", "http1", "server"] }
hyper = { version = "1.5", features = ["http2", "http1", "server"] }
hyper-rustls = { version = "0.27", default-features = false, features = [
"http2",
"webpki-roots",
Expand All @@ -111,7 +111,7 @@ ipnetwork = "0.20.0"
k8s-openapi.workspace = true
lz4_flex = { version = "0.11", default-features = false }
maxminddb = "0.24.0"
notify = "6.1.1"
notify = "7.0.0"
num_cpus = "1.16.0"
mimalloc = { version = "0.1.43", optional = true }
once_cell.workspace = true
Expand All @@ -126,9 +126,9 @@ seahash = "4.1"
serde.workspace = true
serde_json.workspace = true
serde_regex = "1.1.0"
serde_stacker = "0.1.10"
serde_yaml = "0.9.25"
snap = "1.1.0"
serde_stacker = "0.1.11"
serde_yaml = "0.9.34"
snap = "1.1.1"
socket2.workspace = true
stable-eyre = "0.2.2"
thiserror.workspace = true
Expand All @@ -143,18 +143,18 @@ tracing-subscriber = { workspace = true, features = ["json", "env-filter"] }
tryhard.workspace = true
url.workspace = true
uuid.workspace = true
lasso = { version = "0.7.2", features = ["multi-threaded"] }
lasso = { version = "0.7.3", features = ["multi-threaded"] }
kube.workspace = true
kube-core.workspace = true
hickory-resolver = { version = "0.24", features = [
"dns-over-https-rustls",
"system-config",
] }
async-trait = "0.1.73"
async-trait = "0.1.83"
strum = "0.26"
strum_macros = "0.26"
cfg-if = "1.0.0"
libflate = "2.0.0"
libflate = "2.1.0"
form_urlencoded = "1.2.1"
enum_dispatch = "0.3.13"
gxhash = "3.4.1"
Expand All @@ -164,19 +164,19 @@ version = "0.1"
features = ["client", "client-legacy"]

[target.'cfg(target_os = "linux")'.dependencies]
io-uring = { version = "0.6", default-features = false }
io-uring = { version = "0.7", default-features = false }
libc = "0.2"
slab = "0.4"
sys-info = "0.9.1"
pprof = { version = "0.13.0", features = ["prost", "prost-codec"], package = "pprof2" }

[dev-dependencies]
divan = "0.1.2"
divan = "0.1.15"
once_cell.workspace = true
pretty_assertions = "1.4.0"
pretty_assertions = "1.4.1"
rand.workspace = true
regex.workspace = true
tracing-test = "0.2.4"
tracing-test = "0.2.5"
tempfile.workspace = true
xxhash-rust = { version = "0.8", features = ["xxh3"] }

Expand All @@ -193,56 +193,56 @@ license = "Apache-2.0"
edition = "2021"

[workspace.dependencies]
arc-swap = { version = "1.6.0", features = ["serde"] }
async-channel = "2.1.0"
async-stream = "0.3.5"
base64 = "0.22.0"
cached = { version = "0.53", default-features = false }
eyre = "0.6.8"
enum-map = "2.6.3"
futures = "0.3.28"
kube = { version = "0.93", features = [
arc-swap = { version = "1.7.1", features = ["serde"] }
async-channel = "2.3.1"
async-stream = "0.3.6"
base64 = "0.22.1"
cached = { version = "0.54", default-features = false }
eyre = "0.6.12"
enum-map = "2.7.3"
futures = "0.3.31"
kube = { version = "0.97", features = [
"runtime",
"rustls-tls",
"client",
], default-features = false }
kube-core = { version = "0.93", default-features = false, features = [
kube-core = { version = "0.97", default-features = false, features = [
"schema",
] }
k8s-openapi = { version = "0.22", features = ["v1_29", "schemars"] }
once_cell = "1.18.0"
prometheus = { version = "0.13.3", default-features = false }
prost = "0.12"
prost-types = "0.12"
k8s-openapi = { version = "0.23", features = ["v1_29", "schemars"] }
once_cell = "1.20.2"
prometheus = { version = "0.13.4", default-features = false }
prost = "0.13"
prost-types = "0.13"
quilkin = { path = "." }
quilkin-proto = {version = "0.10.0-dev", path = "crates/quilkin-proto" }
rand = "0.8.5"
regex = "1.9.6"
serde = { version = "1.0.188", features = ["derive", "rc"] }
serde_json = "1.0.107"
socket2 = { version = "0.5.4", features = ["all"] }
tempfile = "3.8.0"
thiserror = "1.0.49"
tokio-stream = { version = "0.1.14", features = ["net", "sync"] }
tokio = { version = "1.32.0", features = [
regex = "1.11.1"
serde = { version = "1.0.215", features = ["derive", "rc"] }
serde_json = "1.0.133"
socket2 = { version = "0.5.7", features = ["all"] }
tempfile = "3.14.0"
thiserror = "2.0.3"
tokio-stream = { version = "0.1.16", features = ["net", "sync"] }
tokio = { version = "1.41.1", features = [
"rt-multi-thread",
"fs",
"signal",
"test-util",
"parking_lot",
"tracing",
] }
tonic = "0.11"
tower = "0.4"
tracing = "0.1.37"
tonic = "0.12"
tower = "0.5"
tracing = "0.1.40"
tracing-futures = { version = "0.2.5", features = ["futures-03"] }
tracing-subscriber = "0.3"
tryhard = "0.5.1"
uuid = { version = "1.4.1", default-features = false, features = ["v4"] }
uuid = { version = "1.11.0", default-features = false, features = ["v4"] }
fixedstr = { version = "0.5", features = ["flex-str"] }
parking_lot = "0.12.1"
schemars = { version = "0.8.15", features = ["bytes", "url"] }
url = { version = "2.4.1", features = ["serde"] }
parking_lot = "0.12.3"
schemars = { version = "0.8.21", features = ["bytes", "url"] }
url = { version = "2.5.3", features = ["serde"] }

[workspace.lints.clippy]
undocumented_unsafe_blocks = "deny"
1 change: 1 addition & 0 deletions about.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ accepted = [
"MPL-2.0",
"NOASSERTION",
"Unicode-DFS-2016",
"Unicode-3.0",
"Zlib",
]
workarounds = ["ring", "xxhash-rust"]
Expand Down
2 changes: 1 addition & 1 deletion crates/agones/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ futures.workspace = true
k8s-openapi.workspace = true
kube = { workspace = true, features = ["openssl-tls", "client", "derive", "runtime"] }
quilkin = { path = "../../" }
serial_test = "2.0.0"
serial_test = "3.2.0"
tokio.workspace = true
tracing.workspace = true
2 changes: 1 addition & 1 deletion crates/agones/src/sidecar.rs
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ clusters:
template.volumes = Some(vec![Volume {
name: mount_name,
config_map: Some(ConfigMapVolumeSource {
name: Some(config_map.name_unchecked()),
name: config_map.name_unchecked(),
..Default::default()
}),
..Default::default()
Expand Down
6 changes: 3 additions & 3 deletions crates/macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ proc-macro = true
workspace = true

[dependencies]
proc-macro2 = "1.0.58"
quote = "1.0.27"
syn = { version = "2.0.16", features = ["full", "derive"] }
proc-macro2 = "1.0.89"
quote = "1.0.37"
syn = { version = "2.0.87", features = ["full", "derive"] }
4 changes: 2 additions & 2 deletions crates/test/tests/proxy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ trace_test!(uring_receiver, {
// Drop the socket, otherwise it can
drop(ws);

let _ = ready.recv().unwrap();
ready.recv().unwrap();

let msg = "hello-downstream";
tracing::debug!("sending packet");
Expand Down Expand Up @@ -185,7 +185,7 @@ trace_test!(
.unwrap();

for wn in workers {
let _ = wn.recv().unwrap();
wn.recv().unwrap();
}

let socket = std::sync::Arc::new(sb.client());
Expand Down
12 changes: 7 additions & 5 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ targets = [
all-features = true

[advisories]
ignore = []
ignore = ["RUSTSEC-2024-0384"]

[bans]
deny = [
Expand All @@ -38,13 +38,15 @@ deny = [
]
multiple-versions = "deny"
skip = [
{ crate = "[email protected]", reason = "several crates use this old version" },
]
skip-tree = [
{ crate = "[email protected]", reason = "matchers is using an old version, https://github.com/hawkw/matchers/pull/5, but it's also barely maintained..." },
{ crate = "[email protected]", reason = "Uses _many_ outdated crates" },
# Much like trust-dns this pulls in a ton of outdated dependencies, but it's _slightly_ better
{ crate = "[email protected]", reason = "Uses _many_ outdated crates" },
{ crate = "[email protected]", reason = "several crates use this old version" },
{ crate = "[email protected]", reason = "several crates use this old version" },
{ crate = "[email protected]", reason = "several crates use this old version" },
{ crate = "[email protected]", reason = "several crates use this old version" },
]

[bans.workspace-dependencies]
Expand All @@ -54,13 +56,13 @@ skip-tree = [
# https://embarkstudios.github.io/cargo-deny/checks/licenses/cfg.html
[licenses]
version = 2
allow = ["Apache-2.0", "MIT", "ISC", "BSD-3-Clause"]
allow = ["Apache-2.0", "MIT", "ISC", "BSD-3-Clause", "Unicode-3.0"]
exceptions = [
{ crate = "adler32", allow = ["Zlib"] },
{ crate = "foldhash", allow = ["Zlib"] },
# This license should not really be used for code, but here we are
{ crate = "notify", allow = ["CC0-1.0"] },
{ crate = "ring", allow = ["OpenSSL"] },
{ crate = "unicode-ident", allow = ["Unicode-DFS-2016"] },
{ crate = "webpki-roots", allow = ["MPL-2.0"] },
]

Expand Down
15 changes: 7 additions & 8 deletions src/net/cluster.rs
Original file line number Diff line number Diff line change
Expand Up @@ -265,9 +265,8 @@ pub struct ClusterMap<S = gxhash::GxBuildHasher> {
version: AtomicU64,
}

type DashMapRef<'inner, S> = dashmap::mapref::one::Ref<'inner, Option<Locality>, EndpointSet, S>;
type DashMapRefMut<'inner, S> =
dashmap::mapref::one::RefMut<'inner, Option<Locality>, EndpointSet, S>;
type DashMapRef<'inner> = dashmap::mapref::one::Ref<'inner, Option<Locality>, EndpointSet>;
type DashMapRefMut<'inner> = dashmap::mapref::one::RefMut<'inner, Option<Locality>, EndpointSet>;

impl ClusterMap {
pub fn new() -> Self {
Expand Down Expand Up @@ -348,19 +347,19 @@ where
self.map.is_empty()
}

pub fn get(&self, key: &Option<Locality>) -> Option<DashMapRef<S>> {
pub fn get(&self, key: &Option<Locality>) -> Option<DashMapRef> {
self.map.get(key)
}

pub fn get_mut(&self, key: &Option<Locality>) -> Option<DashMapRefMut<S>> {
pub fn get_mut(&self, key: &Option<Locality>) -> Option<DashMapRefMut> {
self.map.get_mut(key)
}

pub fn get_default(&self) -> Option<DashMapRef<S>> {
pub fn get_default(&self) -> Option<DashMapRef> {
self.get(&None)
}

pub fn get_default_mut(&self) -> Option<DashMapRefMut<S>> {
pub fn get_default_mut(&self) -> Option<DashMapRefMut> {
self.get_mut(&None)
}

Expand Down Expand Up @@ -417,7 +416,7 @@ where
pub fn entry(
&self,
key: Option<Locality>,
) -> dashmap::mapref::entry::Entry<Option<Locality>, EndpointSet, S> {
) -> dashmap::mapref::entry::Entry<Option<Locality>, EndpointSet> {
self.map.entry(key)
}

Expand Down

0 comments on commit 5953b80

Please sign in to comment.