Merge pull request #1013 from cuishuang/master

fix some typos
pull/1017/head
Jeremiah Senkpiel 3 years ago committed by GitHub
commit 264a7125e1

@ -155,7 +155,7 @@ release, and updates internal dependencies.
## Fixed ## Fixed
- Fix `TcpListener::incoming`. ([#889](https://github.com/async-rs/async-std/pull/889)) - Fix `TcpListener::incoming`. ([#889](https://github.com/async-rs/async-std/pull/889))
- Fix tokio compatability flag. ([#882](https://github.com/async-rs/async-std/pull/882)) - Fix tokio compatibility flag. ([#882](https://github.com/async-rs/async-std/pull/882))
# [1.6.4] - 2020-09-16 # [1.6.4] - 2020-09-16
@ -207,7 +207,7 @@ release, and updates internal dependencies.
## Added ## Added
- Added `tokio02` feature flag, to allow compatability usage with tokio@0.2 ([#804](https://github.com/async-rs/async-std/pull/804)). - Added `tokio02` feature flag, to allow compatibility usage with tokio@0.2 ([#804](https://github.com/async-rs/async-std/pull/804)).
## Changed ## Changed

@ -2,7 +2,7 @@
//! //!
//! ## Base Futures Concurrency //! ## Base Futures Concurrency
//! //!
//! Often it's desireable to await multiple futures as if it was a single //! Often it's desirable to await multiple futures as if it was a single
//! future. The `join` family of operations converts multiple futures into a //! future. The `join` family of operations converts multiple futures into a
//! single future that returns all of their outputs. The `race` family of //! single future that returns all of their outputs. The `race` family of
//! operations converts multiple future into a single future that returns the //! operations converts multiple future into a single future that returns the

@ -58,7 +58,7 @@ where
return Poll::Ready(Ordering::Greater); return Poll::Ready(Ordering::Greater);
} }
// Get next value if possible and necesary // Get next value if possible and necessary
if !this.l.done && this.l_cache.is_none() { if !this.l.done && this.l_cache.is_none() {
let l_next = futures_core::ready!(this.l.as_mut().poll_next(cx)); let l_next = futures_core::ready!(this.l.as_mut().poll_next(cx));
if let Some(item) = l_next { if let Some(item) = l_next {

@ -59,7 +59,7 @@ where
return Poll::Ready(Some(Ordering::Greater)); return Poll::Ready(Some(Ordering::Greater));
} }
// Get next value if possible and necesary // Get next value if possible and necessary
if !this.l.done && this.l_cache.is_none() { if !this.l.done && this.l_cache.is_none() {
let l_next = futures_core::ready!(this.l.as_mut().poll_next(cx)); let l_next = futures_core::ready!(this.l.as_mut().poll_next(cx));
if let Some(item) = l_next { if let Some(item) = l_next {

Loading…
Cancel
Save