Skip to content

Commit

Permalink
Bump MSRV to 1.65 to appease time
Browse files Browse the repository at this point in the history
This just barely fits our 6 month policy.
  • Loading branch information
djc committed May 9, 2023
1 parent 843f110 commit e5cbbe4
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/rust.yml
Expand Up @@ -34,16 +34,16 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
rust: [stable, beta, 1.63.0]
rust: [stable, beta, 1.65.0]
exclude:
- os: macos-latest
rust: beta
- os: macos-latest
rust: 1.63.0
rust: 1.65.0
- os: windows-latest
rust: beta
- os: windows-latest
rust: 1.63.0
rust: 1.65.0

runs-on: ${{ matrix.os }}

Expand Down
2 changes: 1 addition & 1 deletion bench/Cargo.toml
Expand Up @@ -2,7 +2,7 @@
name = "bench"
version = "0.1.0"
edition = "2021"
rust-version = "1.63"
rust-version = "1.65"
license = "MIT OR Apache-2.0"
publish = false

Expand Down
2 changes: 1 addition & 1 deletion perf/Cargo.toml
Expand Up @@ -2,7 +2,7 @@
name = "perf"
version = "0.1.0"
edition = "2021"
rust-version = "1.63"
rust-version = "1.65"
license = "MIT OR Apache-2.0"
publish = false

Expand Down
2 changes: 1 addition & 1 deletion quinn-proto/Cargo.toml
Expand Up @@ -2,7 +2,7 @@
name = "quinn-proto"
version = "0.10.0"
edition = "2021"
rust-version = "1.63"
rust-version = "1.65"
license = "MIT OR Apache-2.0"
repository = "https://github.com/quinn-rs/quinn"
description = "State machine for the QUIC transport protocol"
Expand Down
2 changes: 1 addition & 1 deletion quinn-udp/Cargo.toml
Expand Up @@ -2,7 +2,7 @@
name = "quinn-udp"
version = "0.4.0"
edition = "2021"
rust-version = "1.63"
rust-version = "1.65"
license = "MIT OR Apache-2.0"
repository = "https://github.com/quinn-rs/quinn"
description = "UDP sockets with ECN information for the QUIC transport protocol"
Expand Down
2 changes: 1 addition & 1 deletion quinn/Cargo.toml
Expand Up @@ -9,7 +9,7 @@ keywords = ["quic"]
categories = [ "network-programming", "asynchronous" ]
workspace = ".."
edition = "2021"
rust-version = "1.63"
rust-version = "1.65"

[package.metadata.docs.rs]
all-features = true
Expand Down
3 changes: 1 addition & 2 deletions quinn/src/connection.rs
Expand Up @@ -219,8 +219,7 @@ struct ConnectionDriver(ConnectionRef);
impl Future for ConnectionDriver {
type Output = ();

#[allow(unused_mut)] // MSRV
fn poll(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Self::Output> {
fn poll(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Self::Output> {
let conn = &mut *self.0.state.lock("poll");

let span = debug_span!("drive", id = conn.handle.0);
Expand Down
3 changes: 1 addition & 2 deletions quinn/src/endpoint.rs
Expand Up @@ -297,8 +297,7 @@ pub(crate) struct EndpointDriver(pub(crate) EndpointRef);
impl Future for EndpointDriver {
type Output = Result<(), io::Error>;

#[allow(unused_mut)] // MSRV
fn poll(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Self::Output> {
fn poll(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Self::Output> {
let mut endpoint = self.0.state.lock().unwrap();
if endpoint.driver.is_none() {
endpoint.driver = Some(cx.waker().clone());
Expand Down

0 comments on commit e5cbbe4

Please sign in to comment.