Skip to content
This repository has been archived by the owner on Jan 22, 2025. It is now read-only.

v1.17: Patch tokio to vendored version (backport of #34240) #34435

Merged
merged 2 commits into from
Dec 13, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 13, 2023

This is an automatic backport of pull request #34240 done by Mergify.
Cherry-pick of aaa48ec has failed:

On branch mergify/bp/v1.17/pr-34240
Your branch is up to date with 'origin/v1.17'.

You are currently cherry-picking commit aaa48ec8db.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   Cargo.lock

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cargo.toml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Patch tokio to vendored version

* Fix typo

(cherry picked from commit aaa48ec)

# Conflicts:
#	Cargo.toml
Copy link

codecov bot commented Dec 13, 2023

Codecov Report

Merging #34435 (dc11053) into v1.17 (0b6a172) will increase coverage by 0.0%.
The diff coverage is n/a.

Additional details and impacted files
@@           Coverage Diff           @@
##            v1.17   #34435   +/-   ##
=======================================
  Coverage    81.8%    81.8%           
=======================================
  Files         803      803           
  Lines      218166   218166           
=======================================
+ Hits       178476   178543   +67     
+ Misses      39690    39623   -67     

Copy link
Contributor

@steviez steviez left a comment

Choose a reason for hiding this comment

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

LGTM

@CriesofCarrots CriesofCarrots merged commit 928e384 into v1.17 Dec 13, 2023
17 checks passed
@CriesofCarrots CriesofCarrots deleted the mergify/bp/v1.17/pr-34240 branch December 13, 2023 15:55
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants