Skip to content

Commit

Permalink
Merge #2413 #2414
Browse files Browse the repository at this point in the history
2413: build(deps): bump tokio-util from 0.7.4 to 0.7.5 r=andreasots a=dependabot[bot]

Bumps [tokio-util](https://github.com/tokio-rs/tokio) from 0.7.4 to 0.7.5.
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/tokio-rs/tokio/commit/74fb9e387aa3604193ac7da0b103c96ff90c73ee"><code>74fb9e3</code></a> chore: prepare tokio-util v0.7.5 (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/5442">#5442</a>)</li>
<li><a href="https://github.com/tokio-rs/tokio/commit/8b44077ebcf1b1077e76958af3f4bf865406f6de"><code>8b44077</code></a> sync: make CancellationToken UnwindSafe (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/5438">#5438</a>)</li>
<li><a href="https://github.com/tokio-rs/tokio/commit/d6dbefcdc043da552615bf2c8ad1f3a9580a1735"><code>d6dbefc</code></a> sync: mark lock guards with <code>#[clippy::has_significant_drop]</code> (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/5422">#5422</a>)</li>
<li><a href="https://github.com/tokio-rs/tokio/commit/d96bbf04655bc7e40f87967996f0ae8976fe5aae"><code>d96bbf0</code></a> time: don't store deadline twice in sleep entries (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/5410">#5410</a>)</li>
<li><a href="https://github.com/tokio-rs/tokio/commit/09b2653e71f6518bf6a62ac054612e129da13a38"><code>09b2653</code></a> chore: update windows-sys to 0.45 (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/5386">#5386</a>)</li>
<li><a href="https://github.com/tokio-rs/tokio/commit/061325ba7ea952c78b23abe685e40a3aac132a2b"><code>061325b</code></a> task: clarify what happens to spawned work during runtime shutdown (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/5394">#5394</a>)</li>
<li><a href="https://github.com/tokio-rs/tokio/commit/d7d5d05333f7970c2d75bfb20371450b5ad838d7"><code>d7d5d05</code></a> tests: port proptest fuzz harnesses to use cargo-fuzz (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/5392">#5392</a>)</li>
<li><a href="https://github.com/tokio-rs/tokio/commit/1dcfe1cc9bb32fdc57ead3ff642d58bc8f282fd4"><code>1dcfe1c</code></a> ci: add semver checking to CI (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/5437">#5437</a>)</li>
<li><a href="https://github.com/tokio-rs/tokio/commit/5653b4583ccab2e0065a3fc0950de8718149df56"><code>5653b45</code></a> io: remove erroneous wake call in <code>SinkWriter</code> (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/5436">#5436</a>)</li>
<li><a href="https://github.com/tokio-rs/tokio/commit/abf5d28f2ccaf55ea264f1bea7a1ac1bac6fe98b"><code>abf5d28</code></a> rt: remove Arc from Clock (<a href="https://github-redirect.dependabot.com/tokio-rs/tokio/issues/5434">#5434</a>)</li>
<li>Additional commits viewable in <a href="https://github.com/tokio-rs/tokio/compare/tokio-util-0.7.4...tokio-util-0.7.5">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=tokio-util&package-manager=cargo&previous-version=0.7.4&new-version=0.7.5)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

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-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

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` 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)


</details>

2414: build(deps): bump thread_local from 1.1.4 to 1.1.6 r=andreasots a=dependabot[bot]

Bumps [thread_local](https://github.com/Amanieu/thread_local-rs) from 1.1.4 to 1.1.6.
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/Amanieu/thread_local-rs/commit/905dad591e1846a360df8cb309a194a91126e0f8"><code>905dad5</code></a> Bump version to 1.1.6</li>
<li><a href="https://github.com/Amanieu/thread_local-rs/commit/b45a7369ca06da4200b99a12b1f6e1f2724fdc2d"><code>b45a736</code></a> Remove incorrect <code>thread_id::try_get</code> function</li>
<li><a href="https://github.com/Amanieu/thread_local-rs/commit/63c4c627e48dd6904fc585c986bd19f6bf124bbf"><code>63c4c62</code></a> Make criterion a normal dev-dependency</li>
<li><a href="https://github.com/Amanieu/thread_local-rs/commit/da1bb2a95509af0cb59b993cc3078b9ed0626de3"><code>da1bb2a</code></a> Bump MSRV to 1.59 and update CI to Github Actions</li>
<li><a href="https://github.com/Amanieu/thread_local-rs/commit/d350189cbdcd996a90baf43ef612cb49754ab84b"><code>d350189</code></a> Bump version to 1.1.5</li>
<li><a href="https://github.com/Amanieu/thread_local-rs/commit/1466993aa12313b4c3b7cd0a52c00cecd17bdd8d"><code>1466993</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/Amanieu/thread_local-rs/issues/44">#44</a> from Amanieu/split-tls</li>
<li><a href="https://github.com/Amanieu/thread_local-rs/commit/cedabb14305b05bd167b2aee3cc33b0c5a5c8f9c"><code>cedabb1</code></a> Add a &quot;nightly&quot; feature to use <code>#[thread_local]</code></li>
<li><a href="https://github.com/Amanieu/thread_local-rs/commit/6631b73b8c242c4d4d9f936cd4d6d7efec95e26b"><code>6631b73</code></a> Split the thread-id TLS into 2 variables</li>
<li><a href="https://github.com/Amanieu/thread_local-rs/commit/3472eb1147596b334bf67db368c8c56f8ddaea67"><code>3472eb1</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/Amanieu/thread_local-rs/issues/41">#41</a> from atouchet/lic</li>
<li><a href="https://github.com/Amanieu/thread_local-rs/commit/a9687ee92adffd0322e2e11facc25aa2bedbd6ea"><code>a9687ee</code></a> Use SPDX license format</li>
<li>Additional commits viewable in <a href="https://github.com/Amanieu/thread_local-rs/compare/1.1.4...1.1.6">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=thread_local&package-manager=cargo&previous-version=1.1.4&new-version=1.1.6)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

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-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

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` 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)


</details>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
bors[bot] and dependabot[bot] committed Feb 11, 2023
3 parents 76f9caa + aa01eca + 9afa515 commit 619bec4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
9 changes: 5 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Expand Up @@ -36,7 +36,7 @@ strfmt = { version = "0.2.2", default-features = false }
time = { version = "0.3.17", default-features = false, features = ["formatting", "parsing", "macros", "serde", "serde-well-known"] }
time-tz = { version = "1.0.2", default-features = false, features = ["db"] }
tokio = { version = "1.25.0", default-features = false, features = ["net", "fs", "io-util", "rt-multi-thread", "macros", "time", "parking_lot"] }
tokio-util = { version = "0.7.4", default-features = false, features = ["codec"] }
tokio-util = { version = "0.7.5", default-features = false, features = ["codec"] }
tracing = { version = "0.1.37", default-features = false, features = ["std", "attributes", "max_level_trace", "release_max_level_debug"] }
tracing-subscriber = { version = "0.3.16", default-features = false, features = ["fmt", "std", "time", "env-filter", "json", "tracing-log"] }
twilight-cache-inmemory = { version = "0.14.3", default-features = false, features = ["permission-calculator"] }
Expand Down

0 comments on commit 619bec4

Please sign in to comment.