tokio-rs/tokio
1
0
Fork 0
mirror of https://github.com/tokio-rs/tokio.git synced 2026-08-28 00:00:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tokio-1.18.x' into tokio-1.20.x

Browse Source
This commit is contained in:
Carl Lerche
2023-01-17 11:08:06 -08:00
parent ba81945ffc 171ce0ff8d
commit 0d8fe5fe75
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tokio/CHANGELOG.md
+8
View File
@@ -134,6 +134,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
tokio/src/io/split.rs
+4 -1
View File
@@ -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);