Skip to content

Commit

Permalink
Merge pull request #64 from Icelk/dependabot/cargo/tokio-tungstenite-…
Browse files Browse the repository at this point in the history
…0.24

build(deps): update tokio-tungstenite requirement from 0.23 to 0.24
  • Loading branch information
Icelk authored Sep 16, 2024
2 parents 3b6caf8 + b6caac8 commit 9b1e391
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ flate2 = { version = "1", optional = true }
zstd = { version = "0.13", optional = true, default-features = false }

# WebSockets
tokio-tungstenite = { version = "0.23", optional = true, default-features = false }
tokio-tungstenite = { version = "0.24", optional = true, default-features = false }
sha-1 = { version = "0.10", optional = true }
futures-util = { version = "0.3", optional = true, default-features = false, features = ["sink"] }

Expand Down
3 changes: 1 addition & 2 deletions extensions/src/certificate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -266,9 +266,8 @@ pub fn get_account(
) -> Result<(Account, AccountCredentials), small_acme::Error> {
let credentials: Option<AccountCredentials> = account.and_then(|a| {
ron::from_str(&a.0)
.map_err(|err| {
.inspect_err(|_err| {
warn!("ACME credentials have an invalid format");
err
})
.ok()
});
Expand Down
2 changes: 1 addition & 1 deletion signal/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "kvarn_signal"
version = "0.2.0"
authors = ["Icelk <main@icelk.dev>"]
edition = "2021"
rust-version = "1.56"
rust-version = "1.64"
description = "Easy-to-use IPC signaling library, mainly used for kvarnctl"
readme = "README.md"
homepage = "https://kvarn.org/ctl/"
Expand Down
2 changes: 1 addition & 1 deletion src/host.rs
Original file line number Diff line number Diff line change
Expand Up @@ -991,7 +991,7 @@ impl ResolvesServerCert for Collection {
/// All the supported ALPN protocols.
///
/// > ***Note:** this is often not needed, as the ALPN protocols
/// are set in [`host::Collection::make_config()`].*
/// > are set in [`host::Collection::make_config()`].*
#[must_use]
#[allow(unused_mut)]
pub fn alpn() -> Vec<Vec<u8>> {
Expand Down
7 changes: 1 addition & 6 deletions src/uring_udp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -622,12 +622,7 @@ mod cmsg {
/// # Panics
/// - If insufficient buffer space remains.
/// - If `T` has stricter alignment requirements than `cmsghdr`
pub(crate) fn push<T: Copy + ?Sized>(
&mut self,
level: libc::c_int,
ty: libc::c_int,
value: T,
) {
pub(crate) fn push<T>(&mut self, level: libc::c_int, ty: libc::c_int, value: T) {
assert!(mem::align_of::<T>() <= mem::align_of::<libc::cmsghdr>());
let space = unsafe { libc::CMSG_SPACE(mem::size_of_val(&value) as _) as usize };
{
Expand Down

0 comments on commit 9b1e391

Please sign in to comment.