Skip to content

Commit 28312ef

Browse files
committed
update rust toolchain
1 parent e3f363f commit 28312ef

3 files changed

Lines changed: 69 additions & 49 deletions

File tree

.github/workflows/rust.yml

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ name: CI
22

33
on:
44
push:
5-
branches: ['main', '0.8.x']
5+
branches: ["main", "0.8.x"]
66
pull_request:
77
merge_group:
88
schedule:
99
- cron: "21 3 * * 5"
1010

1111
jobs:
1212
test-freebsd:
13-
# see https://github.com/actions/runner/issues/385
14-
# use https://github.com/vmactions/freebsd-vm for now
13+
# see https://github.com/actions/runner/issues/385
14+
# use https://github.com/vmactions/freebsd-vm for now
1515
name: test on freebsd
1616
runs-on: ubuntu-latest
1717
steps:
@@ -158,7 +158,7 @@ jobs:
158158
steps:
159159
- uses: actions/checkout@v6
160160
# Note that we must also update the README when changing the MSRV
161-
- uses: dtolnay/rust-toolchain@1.80.0
161+
- uses: dtolnay/rust-toolchain@1.91.0
162162
- uses: Swatinem/rust-cache@v2
163163
- run: cargo check --locked --lib --all-features -p quinn-udp -p quinn-proto -p quinn
164164

@@ -188,8 +188,8 @@ jobs:
188188
audit:
189189
runs-on: ubuntu-latest
190190
steps:
191-
- uses: actions/checkout@v6
192-
- uses: EmbarkStudios/cargo-deny-action@v2
191+
- uses: actions/checkout@v6
192+
- uses: EmbarkStudios/cargo-deny-action@v2
193193

194194
test-android:
195195
runs-on: ubuntu-latest
@@ -206,52 +206,52 @@ jobs:
206206
emulator-arch: x86_64
207207

208208
steps:
209-
- name: Set API level environment variable
210-
run: echo "API_LEVEL=${{ matrix.api-level }}" >> $GITHUB_ENV
209+
- name: Set API level environment variable
210+
run: echo "API_LEVEL=${{ matrix.api-level }}" >> $GITHUB_ENV
211211

212-
- name: Checkout code
213-
uses: actions/checkout@v6
212+
- name: Checkout code
213+
uses: actions/checkout@v6
214214

215-
- name: Install JDK
216-
uses: actions/setup-java@v5
217-
with:
218-
distribution: 'zulu'
219-
java-version: '21'
215+
- name: Install JDK
216+
uses: actions/setup-java@v5
217+
with:
218+
distribution: "zulu"
219+
java-version: "21"
220220

221-
- name: Install Android SDK
222-
uses: android-actions/setup-android@v3
221+
- name: Install Android SDK
222+
uses: android-actions/setup-android@v3
223223

224-
- name: Install Android NDK
225-
run: sdkmanager --install "ndk;25.2.9519653"
224+
- name: Install Android NDK
225+
run: sdkmanager --install "ndk;25.2.9519653"
226226

227-
- name: Install Rust
228-
uses: dtolnay/rust-toolchain@stable
229-
with:
230-
toolchain: stable
231-
target: ${{ matrix.target }}
227+
- name: Install Rust
228+
uses: dtolnay/rust-toolchain@stable
229+
with:
230+
toolchain: stable
231+
target: ${{ matrix.target }}
232232

233-
- uses: Swatinem/rust-cache@v2
233+
- uses: Swatinem/rust-cache@v2
234234

235-
- name: Install cargo-ndk
236-
run: cargo install cargo-ndk
235+
- name: Install cargo-ndk
236+
run: cargo install cargo-ndk
237237

238-
- name: Build unit tests for Android
239-
run: cargo ndk -t ${{ matrix.target }} test --no-run
238+
- name: Build unit tests for Android
239+
run: cargo ndk -t ${{ matrix.target }} test --no-run
240240

241-
- name: Enable KVM group perms
242-
run: |
243-
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
244-
sudo udevadm control --reload-rules
245-
sudo udevadm trigger --name-match=kvm
241+
- name: Enable KVM group perms
242+
run: |
243+
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
244+
sudo udevadm control --reload-rules
245+
sudo udevadm trigger --name-match=kvm
246246
247-
- name: Set up Android Emulator and run tests
248-
env:
249-
TARGET: ${{ matrix.target }}
250-
uses: reactivecircus/android-emulator-runner@v2
251-
with:
252-
api-level: ${{ matrix.api-level }}
253-
arch: ${{ matrix.emulator-arch }}
254-
script: .github/workflows/rust-android-run-tests-on-emulator.sh
247+
- name: Set up Android Emulator and run tests
248+
env:
249+
TARGET: ${{ matrix.target }}
250+
uses: reactivecircus/android-emulator-runner@v2
251+
with:
252+
api-level: ${{ matrix.api-level }}
253+
arch: ${{ matrix.emulator-arch }}
254+
script: .github/workflows/rust-android-run-tests-on-emulator.sh
255255

256256
features:
257257
strategy:

Cargo.toml

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,18 @@
11
[workspace]
2-
members = ["quinn", "quinn-proto", "quinn-udp", "bench", "perf", "fuzz", "docs/book"]
2+
members = [
3+
"quinn",
4+
"quinn-proto",
5+
"quinn-udp",
6+
"bench",
7+
"perf",
8+
"fuzz",
9+
"docs/book",
10+
]
311
default-members = ["quinn", "quinn-proto", "quinn-udp", "bench", "perf"]
412
resolver = "2"
513

614
[workspace.package]
7-
rust-version = "1.80.0"
15+
rust-version = "1.91.0"
816
edition = "2021"
917
license = "MIT OR Apache-2.0"
1018
repository = "https://github.com/quinn-rs/quinn"
@@ -47,12 +55,24 @@ thiserror = "2.0.3"
4755
tinyvec = { version = "1.1", features = ["alloc"] }
4856
tokio = { version = "1.28.1", features = ["sync"] }
4957
tracing = { version = "0.1.10", default-features = false, features = ["std"] }
50-
tracing-futures = { version = "0.2.0", default-features = false, features = ["std-future"] }
51-
tracing-subscriber = { version = "0.3.0", default-features = false, features = ["env-filter", "fmt", "ansi", "time", "local-time"] }
58+
tracing-futures = { version = "0.2.0", default-features = false, features = [
59+
"std-future",
60+
] }
61+
tracing-subscriber = { version = "0.3.0", default-features = false, features = [
62+
"env-filter",
63+
"fmt",
64+
"ansi",
65+
"time",
66+
"local-time",
67+
] }
5268
url = "2"
5369
wasm-bindgen-test = { version = "0.3.45" }
5470
web-time = "1"
55-
windows-sys = { version = ">=0.52, <=0.61", features = ["Win32_Foundation", "Win32_System_IO", "Win32_Networking_WinSock"] }
71+
windows-sys = { version = ">=0.52, <=0.61", features = [
72+
"Win32_Foundation",
73+
"Win32_System_IO",
74+
"Win32_Networking_WinSock",
75+
] }
5676
cfg_aliases = "0.2"
5777

5878
[profile.bench]

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ The project was founded by [Dirkjan Ochtman](https://github.com/djc) and
2121
- Ordered and unordered stream reads for improved performance
2222
- Works on stable Rust, tested on Linux, macOS and Windows
2323
- Pluggable cryptography, with a standard implementation backed by
24-
[rustls][rustls] and [*ring*][ring]
24+
[rustls][rustls] and [_ring_][ring]
2525
- Application-layer datagrams for small, unreliable messages
2626
- Future-based async API
27-
- Minimum supported Rust version of 1.80.0
27+
- Minimum supported Rust version of 1.91.0
2828

2929
## Overview
3030

0 commit comments

Comments
 (0)