Skip to content

Commit 6d2a43e

Browse files
Merge pull request #794 from async-rs/1-6-0
2 parents 2521408 + e1c8638 commit 6d2a43e

File tree

4 files changed

+15
-9
lines changed

4 files changed

+15
-9
lines changed

CHANGELOG.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://book.async.rs/overview
77

88
## [Unreleased]
99

10+
# [1.6.0] - 2020-05-22
11+
12+
See `1.6.0-beta.1` and `1.6.0-beta.2`.
13+
1014
# [1.6.0-beta.2] - 2020-05-19
1115

1216
## Added
@@ -712,7 +716,8 @@ task::blocking(async {
712716

713717
- Initial beta release
714718

715-
[Unreleased]: https://github.com/async-rs/async-std/compare/v1.6.0-beta.2...HEAD
719+
[Unreleased]: https://github.com/async-rs/async-std/compare/v1.6.0...HEAD
720+
[1.6.0]: https://github.com/async-rs/async-std/compare/v1.5.0...v1.6.0
716721
[1.6.0-beta.2]: https://github.com/async-rs/async-std/compare/v1.6.0-beta.1...v1.6.0-beta.2
717722
[1.6.0-beta.1]: https://github.com/async-rs/async-std/compare/v1.5.0...v1.6.0-beta.1
718723
[1.5.0]: https://github.com/async-rs/async-std/compare/v1.4.0...v1.5.0

Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "async-std"
3-
version = "1.6.0-beta.2"
3+
version = "1.6.0"
44
authors = [
55
"Stjepan Glavina <[email protected]>",
66
"Yoshua Wuyts <[email protected]>",
@@ -71,7 +71,7 @@ slab = { version = "0.4.2", optional = true }
7171
surf = { version = "1.0.3", optional = true }
7272

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

7676
[target.'cfg(target_arch = "wasm32")'.dependencies]
7777
futures-timer = { version = "3.0.2", optional = true, features = ["wasm-bindgen"] }

src/lib.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@
197197
//!
198198
//! ```toml
199199
//! [dependencies.async-std]
200-
//! version = "1.6.0-beta.2"
200+
//! version = "1.6.0"
201201
//! features = ["unstable"]
202202
//! ```
203203
//!
@@ -210,7 +210,7 @@
210210
//!
211211
//! ```toml
212212
//! [dependencies.async-std]
213-
//! version = "1.6.0-beta.2"
213+
//! version = "1.6.0"
214214
//! features = ["attributes"]
215215
//! ```
216216
//!
@@ -219,7 +219,7 @@
219219
//!
220220
//! ```toml
221221
//! [dependencies.async-std]
222-
//! version = "1.6.0-beta.2"
222+
//! version = "1.6.0"
223223
//! default-features = false
224224
//! features = ["std"]
225225
//! ```
@@ -229,7 +229,7 @@
229229
//!
230230
//! ```toml
231231
//! [dependencies.async-std]
232-
//! version = "1.6.0-beta.2"
232+
//! version = "1.6.0"
233233
//! default-features = false
234234
//! features = ["alloc"]
235235
//! ```

src/sync/channel.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -992,6 +992,7 @@ impl<T> Drop for Channel<T> {
992992
/// An error returned from the `try_send` method.
993993
#[cfg(feature = "unstable")]
994994
#[cfg_attr(feature = "docs", doc(cfg(unstable)))]
995+
#[derive(PartialEq, Eq)]
995996
pub enum TrySendError<T> {
996997
/// The channel is full but not disconnected.
997998
Full(T),
@@ -1023,7 +1024,7 @@ impl<T> Display for TrySendError<T> {
10231024
/// An error returned from the `try_recv` method.
10241025
#[cfg(feature = "unstable")]
10251026
#[cfg_attr(feature = "docs", doc(cfg(unstable)))]
1026-
#[derive(Debug)]
1027+
#[derive(Debug, PartialEq, Eq)]
10271028
pub enum TryRecvError {
10281029
/// The channel is empty but not disconnected.
10291030
Empty,
@@ -1046,7 +1047,7 @@ impl Display for TryRecvError {
10461047
/// An error returned from the `recv` method.
10471048
#[cfg(feature = "unstable")]
10481049
#[cfg_attr(feature = "docs", doc(cfg(unstable)))]
1049-
#[derive(Debug)]
1050+
#[derive(Debug, PartialEq, Eq)]
10501051
pub struct RecvError;
10511052

10521053
impl Error for RecvError {}

0 commit comments

Comments
 (0)