Skip to content

Commit

Permalink
bump deps
Browse files Browse the repository at this point in the history
  • Loading branch information
erebe committed Jun 24, 2024
1 parent 7f24217 commit f2404e7
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 29 deletions.
47 changes: 28 additions & 19 deletions Cargo.lock

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

12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@ scopeguard = "1.2.0"

bb8 = { version = "0.8", features = [] }
bytes = { version = "1.6.0", features = [] }
clap = { version = "4.5.6", features = ["derive", "env"] }
clap = { version = "4.5.7", features = ["derive", "env"] }
fast-socks5 = { version = "0.9.6", features = [] }
fastwebsockets = { version = "0.7.2", features = ["upgrade", "simd", "unstable-split"] }
fastwebsockets = { version = "0.8.0", features = ["upgrade", "simd", "unstable-split"] }
futures-util = { version = "0.3.30" }
hickory-resolver = { version = "0.24.1", features = ["tokio", "dns-over-https-rustls", "dns-over-rustls", "native-certs"] }
ppp = { version = "2.2.0", features = [] }

# For config file parsing
regex = { version = "1.10.4", default-features = false, features = ["std", "perf"] }
regex = { version = "1.10.5", default-features = false, features = ["std", "perf"] }
serde_regex = "1.1.0"
serde_yaml = { version = "0.9.34", features = [] }
ipnet = { version = "2.9.0", features = ["serde"] }

hyper = { version = "1.3.1", features = ["client", "http1", "http2"] }
hyper-util = { version = "0.1.5", features = ["tokio", "server", "server-auto"] }
http-body-util = { version = "0.1.1" }
http-body-util = { version = "0.1.2" }
jsonwebtoken = { version = "9.3.0", default-features = false }
log = "0.4.21"
nix = { version = "0.29.0", features = ["socket", "net", "uio"] }
Expand All @@ -53,9 +53,9 @@ tokio-rustls = { version = "0.26.0", default-features = false, features = ["logg

tracing = { version = "0.1.40", features = ["log"] }
tracing-subscriber = { version = "0.3.18", features = ["env-filter", "fmt", "local-time"] }
url = "2.5.0"
url = "2.5.2"
urlencoding = "2.1.3"
uuid = { version = "1.8.0", features = ["v7", "serde"] }
uuid = { version = "1.9.0", features = ["v7", "serde"] }

[target.'cfg(not(target_family = "unix"))'.dependencies]
crossterm = { version = "0.27.0" }
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG BUILDER_IMAGE=builder_cache

############################################################
# Cache image with all the deps
FROM rust:1.78-bookworm AS builder_cache
FROM rust:1.79-bookworm AS builder_cache

RUN rustup component add rustfmt clippy

Expand Down
2 changes: 1 addition & 1 deletion src/dns.rs
Original file line number Diff line number Diff line change
Expand Up @@ -191,4 +191,4 @@ impl RuntimeProvider for TokioRuntimeProviderWithSoMark {

Box::pin(socket)
}
}
}
2 changes: 1 addition & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1316,4 +1316,4 @@ async fn main() {
}

tokio::signal::ctrl_c().await.unwrap();
}
}
3 changes: 2 additions & 1 deletion src/udp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,8 @@ impl UdpStream {
keys_to_delete,
};

let pending_notification = unsafe { std::mem::transmute(s.io.has_data_to_read.notified()) };
let pending_notification =
unsafe { std::mem::transmute::<Notified<'_>, Notified<'static>>(s.io.has_data_to_read.notified()) };
s.pending_notification = Some(pending_notification);

(s, io)
Expand Down

0 comments on commit f2404e7

Please sign in to comment.