Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade socket2 to 0.5 #1558

Merged
merged 4 commits into from
May 11, 2023
Merged

Upgrade socket2 to 0.5 #1558

merged 4 commits into from
May 11, 2023

Conversation

djc
Copy link
Member

@djc djc commented May 8, 2023

This should be okay now that we've bumped our MSRV?

@djc djc requested a review from Ralith May 8, 2023 14:57
@djc djc force-pushed the socket2-0.5 branch 3 times, most recently from 1e39c8d to e5cbbe4 Compare May 9, 2023 09:36
@djc djc requested a review from Ralith May 9, 2023 09:36
@djc djc force-pushed the socket2-0.5 branch 2 times, most recently from 2da390f to 9550d86 Compare May 9, 2023 10:38
@djc
Copy link
Member Author

djc commented May 9, 2023

The CI failure here is confusing. Tokio's support for AsFd was added in tokio-rs/tokio#5514 (released in 1.27), and we already have 1.63 as our MSRV. (Discord thread.)

@djc
Copy link
Member Author

djc commented May 9, 2023

The MSRV issue is a tokio bug, PR in tokio-rs/tokio#5677.

@djc
Copy link
Member Author

djc commented May 9, 2023

I tested this locally with

djc-2021 socket2-0.5 quinn $ git diff
diff --git a/Cargo.toml b/Cargo.toml
index 6a985fb6..ca92f1c2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,3 +7,6 @@ debug = true
 
 [profile.release]
 debug = true
+
+[patch."crates-io"]
+tokio = { path = "../tokio/tokio" }

(with the aforelinked PR checked out) and it seems to be fine:

djc-2021 socket2-0.5 quinn $ cargo +1.63 c --lib --all-features -p quinn-udp -p quinn-proto -p quinn
    Blocking waiting for file lock on build directory
   Compiling tokio v1.28.0 (/Users/djc/src/tokio/tokio)
   Compiling tokio-macros v2.1.0 (/Users/djc/src/tokio/tokio-macros)
    Checking quinn v0.10.0 (/Users/djc/src/quinn/quinn)
    Finished dev [unoptimized + debuginfo] target(s) in 2.70s

So I don't think we need to block the release on the MSRV issue? We can mention it as a caveat in the release notes.

@djc
Copy link
Member Author

djc commented May 9, 2023

@Ralith requested re-review since this now has a bunch of extra stuff.

Copy link
Collaborator

@Ralith Ralith left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great improvements overall!

.github/workflows/rust.yml Outdated Show resolved Hide resolved
@djc djc enabled auto-merge (rebase) May 10, 2023 08:34
@djc djc requested a review from Ralith May 10, 2023 08:35
@djc
Copy link
Member Author

djc commented May 10, 2023

Bumped the tokio dependency in quinn to 1.28.1 which should make the MSRV test pass.

@djc djc merged commit a66ee19 into main May 11, 2023
@djc djc deleted the socket2-0.5 branch May 11, 2023 02:48
djc added a commit that referenced this pull request Sep 20, 2023
djc added a commit that referenced this pull request Sep 20, 2023
djc added a commit that referenced this pull request Sep 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants