Skip to content

Commit

Permalink
Merge pull request #804 from async-rs/tokio02-feature
Browse files Browse the repository at this point in the history
  • Loading branch information
dignifiedquire committed Jun 4, 2020
2 parents 6ca7b09 + 0df3c02 commit 0897b91
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 1 deletion.
11 changes: 11 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,17 @@ jobs:
command: check
args: --no-default-features --features alloc --target thumbv7m-none-eabi -Z avoid-dev-deps

check_tokio_02_feature:
name: Check tokio02 feature
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- name: check tokio02
uses: actions-rs/cargo@v1
with:
command: check
args: --all --features tokio02

cross:
name: Cross compile
runs-on: ubuntu-latest
Expand Down
3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ alloc = [
"futures-core/alloc",
"pin-project-lite",
]
tokio02 = ["smol/tokio02"]

[dependencies]
async-attributes = { version = "1.1.1", optional = true }
Expand Down Expand Up @@ -98,4 +99,4 @@ required-features = ["unstable"]

[[example]]
name = "surf-web"
required-features = ["surf"]
required-features = ["surf"]
9 changes: 9 additions & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,15 @@
//! features = ["attributes"]
//! ```
//!
//! Compatibility with the `tokio` runtime is possible using the `tokio02`
//! Cargo feature:
//!
//! ```toml
//! [dependencies.async-std]
//! version = "1.6.0"
//! features = ["tokio02"]
//! ```
//!
//! Additionally it's possible to only use the core traits and combinators by
//! only enabling the `std` Cargo feature:
//!
Expand Down

0 comments on commit 0897b91

Please sign in to comment.