Skip to content

Commit b7f60f3

Browse files
authored
Update dependencies and bump MSRV to 1.70. (#78)
* Update dependencies and bump MSRV to 1.70. Update windows-sys, mio, and hermit-abi dependencies to support the latest versions. Bump the MSRV to 1.70, to accomodate socket2 0.6. * Work around YAML syntax. * Fix a warning.
1 parent a2a823e commit b7f60f3

3 files changed

Lines changed: 13 additions & 13 deletions

File tree

.github/workflows/main.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,16 @@ jobs:
5050
- run: cargo check --workspace --release -vv --target=x86_64-apple-darwin
5151
- run: cargo check --workspace --release -vv --target=x86_64-apple-darwin --no-default-features
5252

53-
check-1_63:
53+
check-1_70:
5454
name: Check
5555
runs-on: ${{ matrix.os }}
5656
strategy:
5757
matrix:
58-
build: [1.63]
58+
build: [1.70.0]
5959
include:
60-
- build: 1.63
60+
- build: 1.70.0
6161
os: ubuntu-latest
62-
rust: 1.63
62+
rust: 1.70.0
6363

6464
env:
6565
# -D warnings is commented out in our install-rust action; re-add it here.
@@ -104,16 +104,16 @@ jobs:
104104
- run: cargo check --workspace --release -vv
105105
- run: cargo check --workspace --release -vv --no-default-features
106106

107-
check-windows-1_63:
107+
check-windows-1_70:
108108
name: Check Windows
109109
runs-on: ${{ matrix.os }}
110110
strategy:
111111
matrix:
112-
build: [1.63]
112+
build: [1.70.0]
113113
include:
114-
- build: 1.63
114+
- build: 1.70.0
115115
os: windows-latest
116-
rust: 1.63
116+
rust: 1.70.0
117117

118118
env:
119119
# -D warnings is commented out in our install-rust action; re-add it here.

Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ categories = ["os", "rust-patterns"]
99
edition = "2021"
1010
repository = "https://github.com/sunfishcode/io-lifetimes"
1111
include = ["src", "build.rs", "Cargo.toml", "COPYRIGHT", "LICENSE*", "/*.md"]
12-
rust-version = "1.63"
12+
rust-version = "1.70"
1313

1414
[dependencies]
1515
# io-lifetimes only depends on libc/windows-sys for the ability to close
@@ -27,16 +27,16 @@ tokio = { version = "1.6.0", features = ["io-std", "fs", "net", "process"], opti
2727
# Optionally depend on socket2 to implement traits for its types.
2828
socket2 = { version = "0.6.0", optional = true }
2929
# Optionally depend on mio to implement traits for its types.
30-
mio = { version = "0.8.0", features = ["net", "os-ext"], optional = true }
30+
mio = { version = "1.0.0", features = ["net", "os-ext"], optional = true }
3131

3232
[target.'cfg(target_os = "hermit")'.dependencies]
33-
hermit-abi = { version = ">=0.3, <=0.4", optional = true }
33+
hermit-abi = { version = ">=0.3, <=0.5", optional = true }
3434

3535
[target.'cfg(not(windows))'.dependencies]
3636
libc = { version = "0.2.96", optional = true }
3737

3838
[target.'cfg(windows)'.dependencies.windows-sys]
39-
version = ">=0.52, <=0.59"
39+
version = ">=0.52, <=0.60"
4040
optional = true
4141
features = [
4242
"Win32_Foundation",

src/portability.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ impl<T: AsFd> AsSocketlike for T {
226226
#[cfg(windows)]
227227
pub trait AsSocketlike: AsSocket {
228228
/// Borrows the reference.
229-
fn as_socketlike(&self) -> BorrowedSocketlike;
229+
fn as_socketlike(&self) -> BorrowedSocketlike<'_>;
230230

231231
/// Return a borrowing view of a resource which dereferences to a
232232
/// `&Target`.

0 commit comments

Comments
 (0)