-
-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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
tokio: disable default features for mio #5728
tokio: disable default features for mio #5728
Conversation
These changes will be progressively reverted as we merge this into newer branches.
fba402a
to
6824966
Compare
4b9d705
to
2ca7f87
Compare
These changes will be progressively reverted as we merge this into newer branches.
2ca7f87
to
69fa1a2
Compare
Some of these changes will be progressively reverted as we merge this into newer branches.
8c68744
to
2a18018
Compare
Some of these changes will be progressively reverted as we merge this into newer branches.
Warning: DO NOT MERGE MANUALLY. MUST BE MERGED WITH COMMAND-LINE. |
@@ -0,0 +1,32 @@ | |||
# This file is automatically @generated by Cargo. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why was the lockfile committed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I added a few dev-dependencies that have an MSRV that doesn't work on the stable used for this branch. Since I only listed 3 dependencies in the lock-file, the rest should still automatically pick the newest version.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess this means that checkout of this branch in an environment where the lockfile already exists will cause conflicts.
Since predicates
is a dev-dependency, I think using "=" requirement would be fine.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That would work too. I'm going to keep this because I already spent a bunch of time figuring out all of the needed versions with this approach.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(Well, this is a branch for an old version that only a few contributors use, so I think either one is fine.)
This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [tokio](https://tokio.rs) ([source](https://github.com/tokio-rs/tokio)) | dependencies | patch | `1.28.1` -> `1.28.2` | | [tokio](https://tokio.rs) ([source](https://github.com/tokio-rs/tokio)) | dev-dependencies | patch | `1.28.1` -> `1.28.2` | --- ### Release Notes <details> <summary>tokio-rs/tokio</summary> ### [`v1.28.2`](https://github.com/tokio-rs/tokio/releases/tag/tokio-1.28.2): Tokio v1.28.2 [Compare Source](tokio-rs/tokio@tokio-1.28.1...tokio-1.28.2) ##### 1.28.2 (May 28, 2023) Forward ports 1.18.6 changes. ##### Fixed - deps: disable default features for mio ([#​5728]) [#​5728]: tokio-rs/tokio#5728 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNS4xMTUuMiIsInVwZGF0ZWRJblZlciI6IjM1LjExNS4yIiwidGFyZ2V0QnJhbmNoIjoiZGV2ZWxvcCJ9--> Co-authored-by: cabr2-bot <cabr2.help@gmail.com> Reviewed-on: https://codeberg.org/Calciumdibromid/CaBr2/pulls/1926 Reviewed-by: crapStone <crapstone@noreply.codeberg.org> Co-authored-by: Calciumdibromid Bot <cabr2_bot@noreply.codeberg.org> Co-committed-by: Calciumdibromid Bot <cabr2_bot@noreply.codeberg.org>
Bumps tokio from 1.16.1 to 1.20.5. Release notes Sourced from tokio's releases. Tokio v1.20.5 1.20.5 (May 28, 2023) Forward ports 1.18.6 changes. Fixed deps: disable default features for mio (#5728) #5728: tokio-rs/tokio#5728 Tokio v1.20.2 1.20.2 (September 27, 2022) This release removes the dependency on the once_cell crate to restore the MSRV of the 1.20.x LTS release. (#5048) #5048: tokio-rs/tokio#5048 Tokio v1.20.1 1.20.1 (July 25, 2022) Fixed chore: fix version detection in build script (#4860) #4860: tokio-rs/tokio#4860 Tokio v1.20.0 1.20.0 (July 12, 2022) Added tokio: add track_caller to public APIs (#4772, #4791, #4793, #4806, #4808) sync: Add has_changed method to watch::Ref (#4758) Changed time: remove src/time/driver/wheel/stack.rs (#4766) rt: clean up arguments passed to basic scheduler (#4767) net: be more specific about winapi features (#4764) tokio: use const initialized thread locals where possible (#4677) task: various small improvements to LocalKey (#4795) Fixed Documented fs: warn about performance pitfall (#4762) chore: fix spelling (#4769) sync: document spurious failures in oneshot (#4777) sync: add warning for watch in non-Send futures (#4741) chore: fix typo (#4798) ... (truncated) Commits edd172c chore: prepare Tokio v1.20.5 (#5731) 9877fa2 Merge 'tokio-1.18.6' into 'tokio-1.20.x' (#5730) 0f898a3 chore: prepare Tokio v1.18.6 (#5729) d6a9ef5 tokio: disable default features for mio (#5728) 2a18018 ci: fix CI for 1.18.x branch (#5728) f3ce29a chore: prepare Tokio v1.20.4 release 0d8fe5f Merge branch 'tokio-1.18.x' into tokio-1.20.x 171ce0f chore: prepare Tokio v1.18.5 release d6ea7a7 Add T: Unpin bound to ReadHalf::unsplit ba81945 chore: prepare Tokio 1.20.3 release Additional commits viewable in compare view Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase. Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: @dependabot rebase will rebase this PR @dependabot recreate will recreate this PR, overwriting any edits that have been made to it @dependabot merge will merge this PR after your CI passes on it @dependabot squash and merge will squash and merge this PR after your CI passes on it @dependabot cancel merge will cancel a previously requested merge and block automerging @dependabot reopen will reopen this PR if it is closed @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
See tokio-rs/mio#1673 for more info.