mirror of
https://github.com/zerotier/ZeroTierOne.git
synced 2025-01-31 08:25:38 +00:00
Bump tokio from 1.24.1 to 1.24.2 in /zeroidc (#1869)
* Bump tokio from 1.24.1 to 1.24.2 in /zeroidc Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.24.1 to 1.24.2. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/commits) --- updated-dependencies: - dependency-name: tokio dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> * vendor tokio update --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Grant Limberg <grant.limberg@zerotier.com>
This commit is contained in:
parent
6aea546d6f
commit
f0778860e5
4
zeroidc/Cargo.lock
generated
4
zeroidc/Cargo.lock
generated
@ -1165,9 +1165,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tokio"
|
name = "tokio"
|
||||||
version = "1.24.1"
|
version = "1.24.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "1d9f76183f91ecfb55e1d7d5602bd1d979e38a3a522fe900241cf195624d67ae"
|
checksum = "597a12a59981d9e3c38d216785b0c37399f6e415e8d0712047620f189371b0bb"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"autocfg",
|
"autocfg",
|
||||||
"bytes",
|
"bytes",
|
||||||
|
2
zeroidc/vendor/tokio/.cargo-checksum.json
vendored
2
zeroidc/vendor/tokio/.cargo-checksum.json
vendored
File diff suppressed because one or more lines are too long
28
zeroidc/vendor/tokio/CHANGELOG.md
vendored
28
zeroidc/vendor/tokio/CHANGELOG.md
vendored
@ -1,3 +1,13 @@
|
|||||||
|
# 1.24.2 (January 17, 2023)
|
||||||
|
|
||||||
|
Forward ports 1.18.5 changes.
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- io: fix unsoundness in `ReadHalf::unsplit` ([#5375])
|
||||||
|
|
||||||
|
[#5375]: https://github.com/tokio-rs/tokio/pull/5375
|
||||||
|
|
||||||
# 1.24.1 (January 6, 2022)
|
# 1.24.1 (January 6, 2022)
|
||||||
|
|
||||||
This release fixes a compilation failure on targets without `AtomicU64` when using rustc older than 1.63. ([#5356])
|
This release fixes a compilation failure on targets without `AtomicU64` when using rustc older than 1.63. ([#5356])
|
||||||
@ -306,6 +316,16 @@ wasm32-wasi target is given unstable support for the `net` feature.
|
|||||||
[#4956]: https://github.com/tokio-rs/tokio/pull/4956
|
[#4956]: https://github.com/tokio-rs/tokio/pull/4956
|
||||||
[#4959]: https://github.com/tokio-rs/tokio/pull/4959
|
[#4959]: https://github.com/tokio-rs/tokio/pull/4959
|
||||||
|
|
||||||
|
# 1.20.4 (January 17, 2023)
|
||||||
|
|
||||||
|
Forward ports 1.18.5 changes.
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- io: fix unsoundness in `ReadHalf::unsplit` ([#5375])
|
||||||
|
|
||||||
|
[#5375]: https://github.com/tokio-rs/tokio/pull/5375
|
||||||
|
|
||||||
# 1.20.3 (January 3, 2022)
|
# 1.20.3 (January 3, 2022)
|
||||||
|
|
||||||
This release forward ports changes from 1.18.4.
|
This release forward ports changes from 1.18.4.
|
||||||
@ -442,6 +462,14 @@ This release fixes a bug in `Notified::enable`. ([#4747])
|
|||||||
[#4729]: https://github.com/tokio-rs/tokio/pull/4729
|
[#4729]: https://github.com/tokio-rs/tokio/pull/4729
|
||||||
[#4739]: https://github.com/tokio-rs/tokio/pull/4739
|
[#4739]: https://github.com/tokio-rs/tokio/pull/4739
|
||||||
|
|
||||||
|
# 1.18.5 (January 17, 2023)
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- io: fix unsoundness in `ReadHalf::unsplit` ([#5375])
|
||||||
|
|
||||||
|
[#5375]: https://github.com/tokio-rs/tokio/pull/5375
|
||||||
|
|
||||||
# 1.18.4 (January 3, 2022)
|
# 1.18.4 (January 3, 2022)
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
2
zeroidc/vendor/tokio/Cargo.toml
vendored
2
zeroidc/vendor/tokio/Cargo.toml
vendored
@ -13,7 +13,7 @@
|
|||||||
edition = "2018"
|
edition = "2018"
|
||||||
rust-version = "1.49"
|
rust-version = "1.49"
|
||||||
name = "tokio"
|
name = "tokio"
|
||||||
version = "1.24.1"
|
version = "1.24.2"
|
||||||
authors = ["Tokio Contributors <team@tokio.rs>"]
|
authors = ["Tokio Contributors <team@tokio.rs>"]
|
||||||
description = """
|
description = """
|
||||||
An event-driven, non-blocking I/O platform for writing asynchronous I/O
|
An event-driven, non-blocking I/O platform for writing asynchronous I/O
|
||||||
|
2
zeroidc/vendor/tokio/README.md
vendored
2
zeroidc/vendor/tokio/README.md
vendored
@ -56,7 +56,7 @@ Make sure you activated the full features of the tokio crate on Cargo.toml:
|
|||||||
|
|
||||||
```toml
|
```toml
|
||||||
[dependencies]
|
[dependencies]
|
||||||
tokio = { version = "1.24.1", features = ["full"] }
|
tokio = { version = "1.24.2", features = ["full"] }
|
||||||
```
|
```
|
||||||
Then, on your main.rs:
|
Then, on your main.rs:
|
||||||
|
|
||||||
|
5
zeroidc/vendor/tokio/src/io/split.rs
vendored
5
zeroidc/vendor/tokio/src/io/split.rs
vendored
@ -75,7 +75,10 @@ impl<T> ReadHalf<T> {
|
|||||||
/// This can be checked ahead of time by comparing the stream ID
|
/// This can be checked ahead of time by comparing the stream ID
|
||||||
/// of the two halves.
|
/// of the two halves.
|
||||||
#[track_caller]
|
#[track_caller]
|
||||||
pub fn unsplit(self, wr: WriteHalf<T>) -> T {
|
pub fn unsplit(self, wr: WriteHalf<T>) -> T
|
||||||
|
where
|
||||||
|
T: Unpin,
|
||||||
|
{
|
||||||
if self.is_pair_of(&wr) {
|
if self.is_pair_of(&wr) {
|
||||||
drop(wr);
|
drop(wr);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user