Upgrade socket2 to 0.5

.github/workflows/rust.yml

@@ -34,16 +34,12 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        rust: [stable, beta, 1.63.0]
+        rust: [stable, beta]
         exclude:
           - os: macos-latest
             rust: beta
-          - os: macos-latest
-            rust: 1.63.0
           - os: windows-latest
             rust: beta
-          - os: windows-latest
-            rust: 1.63.0
 
     runs-on: ${{ matrix.os }}
 
@@ -68,6 +64,21 @@ jobs:
           command: test
           args: --manifest-path fuzz/Cargo.toml
 
+  msrv:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: 1.63.0
+          override: true
+      - uses: Swatinem/rust-cache@v1
+      - uses: actions-rs/cargo@v1
+        with:
+          command: check
+          args: --lib --all-features -p quinn-udp -p quinn-proto -p quinn
+
   lint:
     runs-on: ubuntu-latest
     steps:

bench/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "bench"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 rust-version = "1.63"
 license = "MIT OR Apache-2.0"
 publish = false

fuzz/Cargo.toml

@@ -3,7 +3,7 @@ name = "fuzz"
 version = "0.1.0"
 publish = false
 license = "MIT OR Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [package.metadata]
 cargo-fuzz = true

perf/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "perf"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 rust-version = "1.63"
 license = "MIT OR Apache-2.0"
 publish = false
@@ -21,7 +21,7 @@ rustls = { version = "0.21.0", default-features = false, features = ["dangerous_
 rustls-pemfile = "1.0.0"
 serde = { version = "1.0", features = ["derive"], optional = true  }
 serde_json = { version = "1.0", optional = true }
-socket2 = "0.4"
+socket2 = "0.5"
 webpki = "0.22"
 clap = { version = "3.2", features = ["derive"] }
 tokio = { version = "1.0.1", features = ["rt", "macros", "signal", "net", "sync"] }

quinn-udp/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "quinn-udp"
 version = "0.4.0"
-edition = "2018"
+edition = "2021"
 rust-version = "1.63"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/quinn-rs/quinn"
@@ -24,7 +24,7 @@ maintenance = { status = "experimental" }
 [dependencies]
 bytes = "1"
 libc = "0.2.113"
-socket2 = "0.4" # 0.5.1 has an MSRV of 1.63
+socket2 = "0.5"
 tracing = "0.1.10"
 
 [target.'cfg(windows)'.dependencies]

quinn-udp/src/fallback.rs

@@ -99,7 +99,7 @@ impl Default for UdpSocketState {
 }
 
 /// Returns the platforms UDP socket capabilities
-pub fn udp_state() -> super::UdpState {
+pub(crate) fn udp_state() -> super::UdpState {
     super::UdpState {
         max_gso_segments: std::sync::atomic::AtomicUsize::new(1),
         gro_segments: 1,
@@ -111,4 +111,4 @@ pub(crate) fn may_fragment() -> bool {
     true
 }
 
-pub const BATCH_SIZE: usize = 1;
+pub(crate) const BATCH_SIZE: usize = 1;

quinn-udp/src/lib.rs

@@ -3,9 +3,9 @@
 #![warn(clippy::use_self)]
 
 #[cfg(unix)]
-use std::os::unix::io::AsRawFd;
+use std::os::unix::io::AsFd;
 #[cfg(windows)]
-use std::os::windows::io::AsRawSocket;
+use std::os::windows::io::AsSocket;
 #[cfg(not(windows))]
 use std::sync::atomic::AtomicBool;
 use std::{
@@ -179,7 +179,7 @@ pub struct UdpSockRef<'a>(socket2::SockRef<'a>);
 #[cfg(unix)]
 impl<'s, S> From<&'s S> for UdpSockRef<'s>
 where
-    S: AsRawFd,
+    S: AsFd,
 {
     fn from(socket: &'s S) -> Self {
         Self(socket.into())
@@ -189,7 +189,7 @@ where
 #[cfg(windows)]
 impl<'s, S> From<&'s S> for UdpSockRef<'s>
 where
-    S: AsRawSocket,
+    S: AsSocket,
 {
     fn from(socket: &'s S) -> Self {
         Self(socket.into())

quinn-udp/src/windows.rs

@@ -146,14 +146,14 @@ impl Default for UdpSocketState {
 }
 
 /// Returns the platforms UDP socket capabilities
-pub fn udp_state() -> super::UdpState {
+pub(crate) fn udp_state() -> super::UdpState {
     super::UdpState {
         max_gso_segments: std::sync::atomic::AtomicUsize::new(1),
         gro_segments: 1,
     }
 }
 
-pub const BATCH_SIZE: usize = 1;
+pub(crate) const BATCH_SIZE: usize = 1;
 
 #[inline]
 pub(crate) fn may_fragment() -> bool {

quinn/Cargo.toml

@@ -44,7 +44,7 @@ proto = { package = "quinn-proto", path = "../quinn-proto", version = "0.10", de
 rustls = { version = "0.21.0", default-features = false, features = ["quic"], optional = true }
 thiserror = "1.0.21"
 tracing = "0.1.10"
-tokio = { version = "1.13.0", features = ["sync"] }
+tokio = { version = "1.28.1", features = ["sync"] }
 udp = { package = "quinn-udp", path = "../quinn-udp", version = "0.4", default-features = false }
 webpki = { version = "0.22", default-features = false, optional = true }
 
@@ -57,7 +57,7 @@ rand = "0.8"
 rcgen = "0.10.0"
 rustls-pemfile = "1.0.0"
 clap = { version = "3.2", features = ["derive"] }
-tokio = { version = "1.0.1", features = ["rt", "rt-multi-thread", "time", "macros", "sync"] }
+tokio = { version = "1.28.1", features = ["rt", "rt-multi-thread", "time", "macros", "sync"] }
 tracing-subscriber = { version = "0.3.0", default-features = false, features = ["env-filter", "fmt", "ansi", "time", "local-time"] }
 tracing-futures = { version = "0.2.0", default-features = false, features = ["std-future"] }
 url = "2"