Skip to content

Commit fed52b2

Browse files
authored
Fix elided namespace warnings in Rust 1.90. (#397)
* Fix elided namespace warnings in Rust 1.90. CI builds with warnings-as-errors, so this is needed to fix CI. * Update CI from windows-2019 to windows-2022.
1 parent 54716a1 commit fed52b2

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,16 +201,16 @@ jobs:
201201
runs-on: ${{ matrix.os }}
202202
strategy:
203203
matrix:
204-
build: [stable, windows-latest, windows-2019, macos-latest, macos-13, beta, ubuntu-22.04, aarch64-ubuntu]
204+
build: [stable, windows-latest, windows-2022, macos-latest, macos-13, beta, ubuntu-22.04, aarch64-ubuntu]
205205
include:
206206
- build: stable
207207
os: ubuntu-latest
208208
rust: stable
209209
- build: windows-latest
210210
os: windows-latest
211211
rust: stable
212-
- build: windows-2019
213-
os: windows-2019
212+
- build: windows-2022
213+
os: windows-2022
214214
rust: stable
215215
- build: macos-latest
216216
os: macos-latest

cap-async-std/src/net/tcp_listener.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ impl TcpListener {
6767
///
6868
/// This corresponds to [`async_std::net::TcpListener::incoming`].
6969
#[inline]
70-
pub fn incoming(&self) -> Incoming {
70+
pub fn incoming(&self) -> Incoming<'_> {
7171
let incoming = self.std.incoming();
7272
Incoming::from_std(incoming)
7373
}

cap-async-std/src/os/unix/net/unix_listener.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ impl UnixListener {
6969
///
7070
/// [`async_std::os::unix::net::UnixListener::incoming`]: https://docs.rs/async-std/latest/async_std/os/unix/net/struct.UnixListener.html#method.incoming
7171
#[inline]
72-
pub fn incoming(&self) -> Incoming {
72+
pub fn incoming(&self) -> Incoming<'_> {
7373
let incoming = self.std.incoming();
7474
Incoming::from_std(incoming)
7575
}

cap-primitives/src/fs/via_parent/open_parent.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ pub(super) fn open_parent<'path, 'borrow>(
3737
/// - Append a `.` to a path with a trailing `..` to avoid requiring our
3838
/// callers to special-case `..`.
3939
/// - Bare absolute paths are ok.
40-
fn split_parent(path: &Path) -> Option<(&Path, Component)> {
40+
fn split_parent(path: &Path) -> Option<(&Path, Component<'_>)> {
4141
if path.as_os_str().is_empty() {
4242
return None;
4343
}

cap-std/src/net/tcp_listener.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ impl TcpListener {
7272
///
7373
/// This corresponds to [`std::net::TcpListener::incoming`].
7474
#[inline]
75-
pub fn incoming(&self) -> Incoming {
75+
pub fn incoming(&self) -> Incoming<'_> {
7676
let incoming = self.std.incoming();
7777
Incoming::from_std(incoming)
7878
}

cap-std/src/os/unix/net/unix_listener.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ impl UnixListener {
9090
///
9191
/// [`std::os::unix::net::UnixListener::incoming`]: https://doc.rust-lang.org/std/os/unix/net/struct.UnixListener.html#method.incoming
9292
#[inline]
93-
pub fn incoming(&self) -> Incoming {
93+
pub fn incoming(&self) -> Incoming<'_> {
9494
let incoming = self.std.incoming();
9595
Incoming::from_std(incoming)
9696
}

0 commit comments

Comments
 (0)