Skip to content

Commit

Permalink
Merge pull request #909 from Silvea12/master
Browse files Browse the repository at this point in the history
Updated docs to correct version + mention tokio03 feature flag
  • Loading branch information
yoshuawuyts authored Nov 6, 2020
2 parents a2ea3c7 + 7d20a44 commit e5191ae
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 7 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -798,7 +798,8 @@ task::blocking(async {

- Initial beta release

[Unreleased]: https://github.com/async-rs/async-std/compare/v1.6.5...HEAD
[Unreleased]: https://github.com/async-rs/async-std/compare/v1.7.0...HEAD
[1.7.0]: https://github.com/async-rs/async-std/compare/v1.6.5...1.7.0
[1.6.5]: https://github.com/async-rs/async-std/compare/v1.6.4...v1.6.5
[1.6.4]: https://github.com/async-rs/async-std/compare/v1.6.3...v1.6.4
[1.6.3]: https://github.com/async-rs/async-std/compare/v1.6.2...v1.6.3
Expand Down
21 changes: 15 additions & 6 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@
//!
//! ```toml
//! [dependencies.async-std]
//! version = "1.6.5"
//! version = "1.7.0"
//! features = ["unstable"]
//! ```
//!
Expand All @@ -210,25 +210,34 @@
//!
//! ```toml
//! [dependencies.async-std]
//! version = "1.6.5"
//! version = "1.7.0"
//! features = ["attributes"]
//! ```
//!
//! Compatibility with the `tokio` runtime is possible using the `tokio02`
//! Compatibility with the `tokio` 0.2 runtime is possible using the `tokio02`
//! Cargo feature:
//!
//! ```toml
//! [dependencies.async-std]
//! version = "1.6.5"
//! version = "1.7.0"
//! features = ["tokio02"]
//! ```
//!
//! Compatibility with the `tokio` 0.3 runtime is also simultaneously possible
//! using the `tokio03` Cargo feature:
//!
//! ```toml
//! [dependencies.async-std]
//! version = "1.7.0"
//! features = ["tokio03"]
//! ```
//!
//! Additionally it's possible to only use the core traits and combinators by
//! only enabling the `std` Cargo feature:
//!
//! ```toml
//! [dependencies.async-std]
//! version = "1.6.5"
//! version = "1.7.0"
//! default-features = false
//! features = ["std"]
//! ```
Expand All @@ -238,7 +247,7 @@
//!
//! ```toml
//! [dependencies.async-std]
//! version = "1.6.5"
//! version = "1.7.0"
//! default-features = false
//! features = ["alloc"]
//! ```
Expand Down

0 comments on commit e5191ae

Please sign in to comment.