From edfbd2ff52b969ca1840f5b4740691274de4e6b6 Mon Sep 17 00:00:00 2001 From: Alice Ryhl Date: Thu, 29 Oct 2020 23:22:00 +0100 Subject: [PATCH 1/2] doc: add from_std change to CHANGELOG --- tokio/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/tokio/CHANGELOG.md b/tokio/CHANGELOG.md index fa17be4d8b8..1eb39c6f598 100644 --- a/tokio/CHANGELOG.md +++ b/tokio/CHANGELOG.md @@ -66,6 +66,7 @@ Biggest changes are: - fs: `File` operations take `&self` (#2930). - rt: runtime API, and `#[tokio::main]` macro polish (#2876) - rt: `Runtime::enter` uses an RAII guard instead of a closure (#2954). +- net: the `from_std` function on all sockets no longer sets `O_NONBLOCK` (#2893) ### Added - sync: `map` function to lock guards (#2445). From 7b4fee3caa8f4af35e0926d1f070e162eef032d6 Mon Sep 17 00:00:00 2001 From: Alice Ryhl Date: Sat, 31 Oct 2020 12:32:16 +0100 Subject: [PATCH 2/2] Update tokio/CHANGELOG.md Co-authored-by: Taiki Endo --- tokio/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tokio/CHANGELOG.md b/tokio/CHANGELOG.md index 1eb39c6f598..565adb5e844 100644 --- a/tokio/CHANGELOG.md +++ b/tokio/CHANGELOG.md @@ -66,7 +66,7 @@ Biggest changes are: - fs: `File` operations take `&self` (#2930). - rt: runtime API, and `#[tokio::main]` macro polish (#2876) - rt: `Runtime::enter` uses an RAII guard instead of a closure (#2954). -- net: the `from_std` function on all sockets no longer sets `O_NONBLOCK` (#2893) +- net: the `from_std` function on all sockets no longer sets socket into non-blocking mode (#2893) ### Added - sync: `map` function to lock guards (#2445).