diff --git a/actix-rt/CHANGES.md b/actix-rt/CHANGES.md index a547593e..d3b74137 100644 --- a/actix-rt/CHANGES.md +++ b/actix-rt/CHANGES.md @@ -4,7 +4,8 @@ ## 2.0.0-beta.3 - 2021-01-31 -* Remove `run_in_tokio`, `attach_to_tokio` and `AsyncSystemRunne +* Remove `run_in_tokio`, `attach_to_tokio` and `AsyncSystemRunner`. [#253] +* Return `JoinHandle` from `actix_rt::spawn`. [#253] * Remove old `Arbiter::spawn`. Implementation is now inlined into `actix_rt::spawn`. [#253] * Rename `Arbiter::{send => spawn}` and `Arbiter::{exec_fn => spawn_fn}`. [#253] * Remove `Arbiter::exec`. [#253] diff --git a/actix-rt/tests/tests.rs b/actix-rt/tests/tests.rs index de777628..1b81de16 100644 --- a/actix-rt/tests/tests.rs +++ b/actix-rt/tests/tests.rs @@ -277,7 +277,5 @@ fn new_arbiter_with_tokio() { arb.join().unwrap(); - std::thread::sleep(std::time::Duration::from_millis(100)); - assert_eq!(false, counter.load(std::sync::atomic::Ordering::SeqCst)); } diff --git a/actix-server/src/accept.rs b/actix-server/src/accept.rs index 39be07e3..2b56d11f 100644 --- a/actix-server/src/accept.rs +++ b/actix-server/src/accept.rs @@ -80,7 +80,7 @@ struct Accept { next: usize, backpressure: bool, // poll time duration. - // use the nearest timeout from socket timeout settings. + // use the smallest duration from sockets timeout_deadline. timeout: Option, }