Skip to content
Merged
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
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://book.async.rs/overview

## [Unreleased]

# [1.6.0] - 2020-05-22

See `1.6.0-beta.1` and `1.6.0-beta.2`.

# [1.6.0-beta.2] - 2020-05-19

## Added
Expand Down Expand Up @@ -712,7 +716,8 @@ task::blocking(async {

- Initial beta release

[Unreleased]: https://github.com/async-rs/async-std/compare/v1.6.0-beta.2...HEAD
[Unreleased]: https://github.com/async-rs/async-std/compare/v1.6.0...HEAD
[1.6.0]: https://github.com/async-rs/async-std/compare/v1.5.0...v1.6.0
[1.6.0-beta.2]: https://github.com/async-rs/async-std/compare/v1.6.0-beta.1...v1.6.0-beta.2
[1.6.0-beta.1]: https://github.com/async-rs/async-std/compare/v1.5.0...v1.6.0-beta.1
[1.5.0]: https://github.com/async-rs/async-std/compare/v1.4.0...v1.5.0
Expand Down
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "async-std"
version = "1.6.0-beta.2"
version = "1.6.0"
authors = [
"Stjepan Glavina <stjepang@gmail.com>",
"Yoshua Wuyts <yoshuawuyts@gmail.com>",
Expand Down Expand Up @@ -71,7 +71,7 @@ slab = { version = "0.4.2", optional = true }
surf = { version = "1.0.3", optional = true }

[target.'cfg(not(target_os = "unknown"))'.dependencies]
smol = { version = "0.1.8", optional = true }
smol = { version = "0.1.10", optional = true }

[target.'cfg(target_arch = "wasm32")'.dependencies]
futures-timer = { version = "3.0.2", optional = true, features = ["wasm-bindgen"] }
Expand Down
8 changes: 4 additions & 4 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.0-beta.2"
//! version = "1.6.0"
//! features = ["unstable"]
//! ```
//!
Expand All @@ -210,7 +210,7 @@
//!
//! ```toml
//! [dependencies.async-std]
//! version = "1.6.0-beta.2"
//! version = "1.6.0"
//! features = ["attributes"]
//! ```
//!
Expand All @@ -219,7 +219,7 @@
//!
//! ```toml
//! [dependencies.async-std]
//! version = "1.6.0-beta.2"
//! version = "1.6.0"
//! default-features = false
//! features = ["std"]
//! ```
Expand All @@ -229,7 +229,7 @@
//!
//! ```toml
//! [dependencies.async-std]
//! version = "1.6.0-beta.2"
//! version = "1.6.0"
//! default-features = false
//! features = ["alloc"]
//! ```
Expand Down
5 changes: 3 additions & 2 deletions src/sync/channel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -992,6 +992,7 @@ impl<T> Drop for Channel<T> {
/// An error returned from the `try_send` method.
#[cfg(feature = "unstable")]
#[cfg_attr(feature = "docs", doc(cfg(unstable)))]
#[derive(PartialEq, Eq)]
pub enum TrySendError<T> {
/// The channel is full but not disconnected.
Full(T),
Expand Down Expand Up @@ -1023,7 +1024,7 @@ impl<T> Display for TrySendError<T> {
/// An error returned from the `try_recv` method.
#[cfg(feature = "unstable")]
#[cfg_attr(feature = "docs", doc(cfg(unstable)))]
#[derive(Debug)]
#[derive(Debug, PartialEq, Eq)]
pub enum TryRecvError {
/// The channel is empty but not disconnected.
Empty,
Expand All @@ -1046,7 +1047,7 @@ impl Display for TryRecvError {
/// An error returned from the `recv` method.
#[cfg(feature = "unstable")]
#[cfg_attr(feature = "docs", doc(cfg(unstable)))]
#[derive(Debug)]
#[derive(Debug, PartialEq, Eq)]
pub struct RecvError;

impl Error for RecvError {}
Expand Down