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.

Sign up for GitHub

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

Jump to bottom

Update stream, util, test to 2021 edition #5571

Merged
merged 1 commit into from
Mar 21, 2023
Merged

Update stream, util, test to 2021 edition #5571

merged 1 commit into from
Mar 21, 2023

Conversation

tzx
Copy link
Contributor

@tzx tzx commented Mar 21, 2023 •
edited by Darksonn
Loading

Motivation

I want to close #5560, so tokio-stream, tokio-util, and tokio-test can be updated to the 2021 edition.

Solution

  1. I grepped for traits that are already included in the Prelude (TryInto, TryFrom and FromIterator) and removed shortened paths. There weren't any imports that had those traits.
  2. I ran cargo fix --edition on the mentioned crates. I did see a disjoint capture change in the closure here:

    tokio/tokio-util/src/sync/reusable_box.rs

    Line 65 in b489acb

    reuse_pin_box(boxed, future, |boxed| this.boxed = Pin::from(boxed))
    but I changed it back since it seems fine (I'm not entirely sure though). Other than that, I didn't see any more changes.

I'm not sure if there are more things to do. I would be happy to work on them.

Closes #5560

@Darksonn
Copy link
Contributor

We have to merge #5559 before I can review this. I will do it soon.

@Darksonn Darksonn added A-tokio-util Area: The tokio-util crate A-tokio-test Area: The tokio-test crate A-tokio-stream Area: The tokio-stream crate labels Mar 21, 2023
@Darksonn
Copy link
Contributor

Please resolve the merge conflicts. Then this should be good to go. Thanks!

@tzx tzx force-pushed the tzx/2021-edition-stream-util-test branch from fe57bf6 to 521789e Compare March 21, 2023 17:16
@tzx
Copy link
Contributor Author

tzx commented Mar 21, 2023

Please resolve the merge conflicts. Then this should be good to go. Thanks!

Should be good now!

Darksonn
Darksonn approved these changes Mar 21, 2023
View reviewed changes
Copy link
Contributor

@Darksonn Darksonn left a comment

Choose a reason for hiding this comment

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

Thanks!

@Darksonn Darksonn enabled auto-merge (squash) March 21, 2023 17:22
@Darksonn Darksonn merged commit a7bb054 into tokio-rs:master Mar 21, 2023
@tzx tzx deleted the tzx/2021-edition-stream-util-test branch March 25, 2023 16:43
@taiki-e taiki-e mentioned this pull request Jun 11, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Darksonn Darksonn Darksonn approved these changes

Assignees
No one assigned
Labels
A-tokio-stream Area: The tokio-stream crate A-tokio-test Area: The tokio-test crate A-tokio-util Area: The tokio-util crate
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Upgrade to 2021 edition
2 participants
@tzx @Darksonn