diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 243d15ce7..43cbfc790 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -201,7 +201,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - build: [stable, windows-latest, windows-2019, macos-latest, macos-13, beta, ubuntu-22.04, aarch64-ubuntu] + build: [stable, windows-latest, windows-2022, macos-latest, macos-13, beta, ubuntu-22.04, aarch64-ubuntu] include: - build: stable os: ubuntu-latest @@ -209,8 +209,8 @@ jobs: - build: windows-latest os: windows-latest rust: stable - - build: windows-2019 - os: windows-2019 + - build: windows-2022 + os: windows-2022 rust: stable - build: macos-latest os: macos-latest diff --git a/cap-async-std/src/net/tcp_listener.rs b/cap-async-std/src/net/tcp_listener.rs index b14ad3370..b097ad681 100644 --- a/cap-async-std/src/net/tcp_listener.rs +++ b/cap-async-std/src/net/tcp_listener.rs @@ -67,7 +67,7 @@ impl TcpListener { /// /// This corresponds to [`async_std::net::TcpListener::incoming`]. #[inline] - pub fn incoming(&self) -> Incoming { + pub fn incoming(&self) -> Incoming<'_> { let incoming = self.std.incoming(); Incoming::from_std(incoming) } diff --git a/cap-async-std/src/os/unix/net/unix_listener.rs b/cap-async-std/src/os/unix/net/unix_listener.rs index 919167102..bc00e0b6d 100644 --- a/cap-async-std/src/os/unix/net/unix_listener.rs +++ b/cap-async-std/src/os/unix/net/unix_listener.rs @@ -69,7 +69,7 @@ impl UnixListener { /// /// [`async_std::os::unix::net::UnixListener::incoming`]: https://docs.rs/async-std/latest/async_std/os/unix/net/struct.UnixListener.html#method.incoming #[inline] - pub fn incoming(&self) -> Incoming { + pub fn incoming(&self) -> Incoming<'_> { let incoming = self.std.incoming(); Incoming::from_std(incoming) } diff --git a/cap-primitives/src/fs/via_parent/open_parent.rs b/cap-primitives/src/fs/via_parent/open_parent.rs index 3b6fd2c54..fe52e6c7d 100644 --- a/cap-primitives/src/fs/via_parent/open_parent.rs +++ b/cap-primitives/src/fs/via_parent/open_parent.rs @@ -37,7 +37,7 @@ pub(super) fn open_parent<'path, 'borrow>( /// - Append a `.` to a path with a trailing `..` to avoid requiring our /// callers to special-case `..`. /// - Bare absolute paths are ok. -fn split_parent(path: &Path) -> Option<(&Path, Component)> { +fn split_parent(path: &Path) -> Option<(&Path, Component<'_>)> { if path.as_os_str().is_empty() { return None; } diff --git a/cap-std/src/net/tcp_listener.rs b/cap-std/src/net/tcp_listener.rs index 2f4f1b042..5d6c95b03 100644 --- a/cap-std/src/net/tcp_listener.rs +++ b/cap-std/src/net/tcp_listener.rs @@ -72,7 +72,7 @@ impl TcpListener { /// /// This corresponds to [`std::net::TcpListener::incoming`]. #[inline] - pub fn incoming(&self) -> Incoming { + pub fn incoming(&self) -> Incoming<'_> { let incoming = self.std.incoming(); Incoming::from_std(incoming) } diff --git a/cap-std/src/os/unix/net/unix_listener.rs b/cap-std/src/os/unix/net/unix_listener.rs index 8ecf9aaa8..5f5d65de0 100644 --- a/cap-std/src/os/unix/net/unix_listener.rs +++ b/cap-std/src/os/unix/net/unix_listener.rs @@ -90,7 +90,7 @@ impl UnixListener { /// /// [`std::os::unix::net::UnixListener::incoming`]: https://doc.rust-lang.org/std/os/unix/net/struct.UnixListener.html#method.incoming #[inline] - pub fn incoming(&self) -> Incoming { + pub fn incoming(&self) -> Incoming<'_> { let incoming = self.std.incoming(); Incoming::from_std(incoming) }