Commit 264a712

authored

Merge pull request #1013 from cuishuang/master

fix some typos

2 parents f8231d7 + ab112d5 commit 264a712Copy full SHA for 264a712

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ release, and updates internal dependencies.`
`155`	`155`	`## Fixed`
`156`	`156`
`157`	`157`	- Fix `TcpListener::incoming`. ([#889](https://github.com/async-rs/async-std/pull/889))
`158`		`-- Fix tokio compatability flag. ([#882](https://github.com/async-rs/async-std/pull/882))`
	`158`	`+- Fix tokio compatibility flag. ([#882](https://github.com/async-rs/async-std/pull/882))`
`159`	`159`
`160`	`160`	`# [1.6.4] - 2020年09月16日`
`161`	`161`
`@@ -207,7 +207,7 @@ release, and updates internal dependencies.`
`207`	`207`
`208`	`208`	`## Added`
`209`	`209`
`210`		-- Added `tokio02` feature flag, to allow compatability usage with tokio@0.2 ([#804](https://github.com/async-rs/async-std/pull/804)).
	`210`	+- Added `tokio02` feature flag, to allow compatibility usage with tokio@0.2 ([#804](https://github.com/async-rs/async-std/pull/804)).
`211`	`211`
`212`	`212`	`## Changed`
`213`	`213`

Lines changed: 1 addition & 1 deletion

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ where`
`58`	`58`	`return Poll::Ready(Ordering::Greater);`
`59`	`59`	`}`
`60`	`60`
`61`		`- // Get next value if possible and necesary`
	`61`	`+ // Get next value if possible and necessary`
`62`	`62`	`if !this.l.done && this.l_cache.is_none() {`
`63`	`63`	`let l_next = futures_core::ready!(this.l.as_mut().poll_next(cx));`
`64`	`64`	`if let Some(item) = l_next {`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ where`
`59`	`59`	`return Poll::Ready(Some(Ordering::Greater));`
`60`	`60`	`}`
`61`	`61`
`62`		`- // Get next value if possible and necesary`
	`62`	`+ // Get next value if possible and necessary`
`63`	`63`	`if !this.l.done && this.l_cache.is_none() {`
`64`	`64`	`let l_next = futures_core::ready!(this.l.as_mut().poll_next(cx));`
`65`	`65`	`if let Some(item) = l_next {`

Comments

(0)