Skip to content

Use stable async-std channels from async 1.9; this fixes the build. Drop the 'unstable' feature. #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,3 @@ jobs:
uses: actions-rs/cargo@v1
with:
command: test
args: --features unstable
5 changes: 1 addition & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,4 @@ description = "Experimental cooperative cancellation for async-std"

[dependencies]
pin-project-lite = "0.1.0"
async-std = "1.0"

[features]
unstable = ["async-std/unstable"]
async-std = "1.9"
13 changes: 2 additions & 11 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,6 @@
//! Experimental. The library works as is, breaking changes will bump major
//! version, but there are no guarantees of long-term support.
//!
//! Additionally, this library uses unstable cargo feature feature of `async-std` and, for
//! this reason, should be used like this:
//!
//! ```toml
//! [dependencies.stop-token]
//! version = "0.1.0"
//! features = [ "unstable" ]
//! ```
//!
//! # Motivation
//!
//! Rust futures come with a build-in cancellation mechanism: dropping a future
Expand Down Expand Up @@ -71,7 +62,7 @@ use std::pin::Pin;
use std::task::{Context, Poll};

use async_std::prelude::*;
use async_std::sync::{channel, Receiver, Sender};
use async_std::channel::{self, Receiver, Sender};
use pin_project_lite::pin_project;

enum Never {}
Expand Down Expand Up @@ -101,7 +92,7 @@ pub struct StopToken {

impl Default for StopSource {
fn default() -> StopSource {
let (sender, receiver) = channel::<Never>(1);
let (sender, receiver) = channel::bounded::<Never>(1);

StopSource {
_chan: sender,
Expand Down
16 changes: 8 additions & 8 deletions tests/tests.rs
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
use std::time::Duration;

use async_std::{prelude::*, task, sync::channel};
use async_std::{prelude::*, task, channel};

use stop_token::StopSource;

#[test]
fn smoke() {
task::block_on(async {
let (sender, receiver) = channel::<i32>(10);
let (sender, receiver) = channel::bounded::<i32>(10);
let stop_source = StopSource::new();
let task = task::spawn({
let stop_token = stop_source.stop_token();
Expand All @@ -20,17 +20,17 @@ fn smoke() {
}
xs
}});
sender.send(1).await;
sender.send(2).await;
sender.send(3).await;
assert!(sender.send(1).await.is_ok());
assert!(sender.send(2).await.is_ok());
assert!(sender.send(3).await.is_ok());

task::sleep(Duration::from_millis(250)).await;
drop(stop_source);
task::sleep(Duration::from_millis(250)).await;

sender.send(4).await;
sender.send(5).await;
sender.send(6).await;
assert!(sender.send(4).await.is_ok());
assert!(sender.send(5).await.is_ok());
assert!(sender.send(6).await.is_ok());
assert_eq!(task.await, vec![1, 2, 3]);
})
}