Skip to content

Commit

Permalink
Merge pull request #790 from async-rs/1-6-0-beta-2
Browse files Browse the repository at this point in the history
  • Loading branch information
dignifiedquire authored May 20, 2020
2 parents 70dac51 + c9ecb5b commit 955befd
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 8 deletions.
16 changes: 14 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,21 @@ and this project adheres to [Semantic Versioning](https://book.async.rs/overview

## [Unreleased]

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

## Added

- Added an environment variable to configure the thread pool size of the runtime. ([#774](https://github.com/async-rs/async-std/pull/774))
- Implement `Clone` for `UnixStream` ([#772](https://github.com/async-rs/async-std/pull/772))

## Changed

- For `wasm`, switched underlying `Timer` implementation to [`futures-timer`](https://github.com/async-rs/futures-timer). ([#776](https://github.com/async-rs/async-std/pull/776))

## Fixed

- Use `smol::block_on` to handle drop of `File`, avoiding nested executor panic. ([#768](https://github.com/async-rs/async-std/pull/768))

# [1.6.0-beta.1] - 2020-05-07

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

- Initial beta release

[Unreleased]: https://github.com/async-rs/async-std/compare/v1.5.0...HEAD
[1.6.0-beta.1]: https://github.com/async-rs/async-std/compare/v1.4.0...v1.6.0-beta.1
[Unreleased]: https://github.com/async-rs/async-std/compare/v1.6.0-beta.2...HEAD
[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
[1.4.0]: https://github.com/async-rs/async-std/compare/v1.3.0...v1.4.0
[1.3.0]: https://github.com/async-rs/async-std/compare/v1.2.0...v1.3.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.1"
version = "1.6.0-beta.2"
authors = [
"Stjepan Glavina <[email protected]>",
"Yoshua Wuyts <[email protected]>",
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.1", optional = true }
smol = { version = "0.1.8", 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.1"
//! version = "1.6.0-beta.2"
//! features = ["unstable"]
//! ```
//!
Expand All @@ -210,7 +210,7 @@
//!
//! ```toml
//! [dependencies.async-std]
//! version = "1.6.0-beta.1"
//! version = "1.6.0-beta.2"
//! features = ["attributes"]
//! ```
//!
Expand All @@ -219,7 +219,7 @@
//!
//! ```toml
//! [dependencies.async-std]
//! version = "1.6.0-beta.1"
//! version = "1.6.0-beta.2"
//! default-features = false
//! features = ["std"]
//! ```
Expand All @@ -229,7 +229,7 @@
//!
//! ```toml
//! [dependencies.async-std]
//! version = "1.6.0-beta.1"
//! version = "1.6.0-beta.2"
//! default-features = false
//! features = ["alloc"]
//! ```
Expand Down

0 comments on commit 955befd

Please sign in to comment.