summaryrefslogtreecommitdiffstats
path: root/tokio
diff options
context:
space:
mode:
authorCarl Lerche <me@carllerche.com>2019-09-19 13:39:35 -0700
committerGitHub <noreply@github.com>2019-09-19 13:39:35 -0700
commit80ba2a4ff60247f49537ee7d67baa0c22f6be16e (patch)
tree28bce4a874e49217b42f523a30a9de981b1b9061 /tokio
parent8d09f61d3317fbb87288ad8bba19beed0cde8aab (diff)
Release 0.2.0 alpha.5 (#1576)
Diffstat (limited to 'tokio')
-rw-r--r--tokio/CHANGELOG.md9
-rw-r--r--tokio/Cargo.toml26
-rw-r--r--tokio/src/lib.rs2
3 files changed, 23 insertions, 14 deletions
diff --git a/tokio/CHANGELOG.md b/tokio/CHANGELOG.md
index d905ddfb..82d42777 100644
--- a/tokio/CHANGELOG.md
+++ b/tokio/CHANGELOG.md
@@ -1,6 +1,15 @@
This changelog only applies to the `tokio` crate proper. Each sub crate
maintains its own changelog tracking changes made in each respective sub crate.
+# 0.2.0-alpha.5 (September 19, 2019)
+
+### Changed
+- rename `sleep` to `delay_for` (#1518).
+- rename `Lock` to `Mutex` and make it more like `std::sync::Mutex` (#1573).
+
+### Added
+- add generic `split` for `AsyncRead + AsyncWrite` (#1521).
+
# 0.2.0-alpha.4 (August 29, 2019)
- Track tokio-net release.
diff --git a/tokio/Cargo.toml b/tokio/Cargo.toml
index 3ba58feb..14779e0e 100644
--- a/tokio/Cargo.toml
+++ b/tokio/Cargo.toml
@@ -8,12 +8,12 @@ name = "tokio"
# - README.md
# - Update CHANGELOG.md.
# - Create "v0.2.x" git tag.
-version = "0.2.0-alpha.4"
+version = "0.2.0-alpha.5"
edition = "2018"
authors = ["Tokio Contributors <team@tokio.rs>"]
license = "MIT"
readme = "README.md"
-documentation = "https://docs.rs/tokio/0.2.0-alpha.4/tokio/"
+documentation = "https://docs.rs/tokio/0.2.0-alpha.5/tokio/"
repository = "https://github.com/tokio-rs/tokio"
homepage = "https://tokio.rs"
description = """
@@ -64,22 +64,22 @@ futures-util-preview = { version = "=0.3.0-alpha.18", features = ["sink"] }
# Everything else is optional...
bytes = { version = "0.4", optional = true }
num_cpus = { version = "1.8.0", optional = true }
-tokio-codec = { version = "=0.2.0-alpha.4", optional = true, path = "../tokio-codec" }
-tokio-fs = { version = "=0.2.0-alpha.4", optional = true, path = "../tokio-fs" }
-tokio-io = { version = "=0.2.0-alpha.4", optional = true, features = ["util"], path = "../tokio-io" }
-tokio-executor = { version = "=0.2.0-alpha.4", optional = true, path = "../tokio-executor" }
-tokio-macros = { version = "=0.2.0-alpha.4", optional = true, path = "../tokio-macros" }
-tokio-net = { version = "=0.2.0-alpha.4", optional = true, features = ["async-traits"], path = "../tokio-net" }
-tokio-sync = { version = "=0.2.0-alpha.4", optional = true, path = "../tokio-sync", features = ["async-traits"] }
-tokio-timer = { version = "=0.3.0-alpha.4", optional = true, path = "../tokio-timer", features = ["async-traits"] }
+tokio-codec = { version = "=0.2.0-alpha.5", optional = true, path = "../tokio-codec" }
+tokio-fs = { version = "=0.2.0-alpha.5", optional = true, path = "../tokio-fs" }
+tokio-io = { version = "=0.2.0-alpha.5", optional = true, features = ["util"], path = "../tokio-io" }
+tokio-executor = { version = "=0.2.0-alpha.5", optional = true, path = "../tokio-executor" }
+tokio-macros = { version = "=0.2.0-alpha.5", optional = true, path = "../tokio-macros" }
+tokio-net = { version = "=0.2.0-alpha.5", optional = true, features = ["async-traits"], path = "../tokio-net" }
+tokio-sync = { version = "=0.2.0-alpha.5", optional = true, path = "../tokio-sync", features = ["async-traits"] }
+tokio-timer = { version = "=0.3.0-alpha.5", optional = true, path = "../tokio-timer", features = ["async-traits"] }
tracing-core = { version = "0.1", optional = true }
[target.'cfg(feature = "tracing")'.dependencies]
-tokio-net = { version = "=0.2.0-alpha.4", optional = true, path = "../tokio-net", features = ["tracing", "async-traits"] }
-tokio-executor = { version = "=0.2.0-alpha.4", optional = true, path = "../tokio-executor", features = ["tracing"] }
+tokio-net = { version = "=0.2.0-alpha.5", optional = true, path = "../tokio-net", features = ["tracing", "async-traits"] }
+tokio-executor = { version = "=0.2.0-alpha.5", optional = true, path = "../tokio-executor", features = ["tracing"] }
[dev-dependencies]
-tokio-test = { version = "0.2.0-alpha.4", path = "../tokio-test" }
+tokio-test = { version = "=0.2.0-alpha.5", path = "../tokio-test" }
futures-preview = "=0.3.0-alpha.18"
futures-util-preview = "=0.3.0-alpha.18"
diff --git a/tokio/src/lib.rs b/tokio/src/lib.rs
index b9758f00..30375c0a 100644
--- a/tokio/src/lib.rs
+++ b/tokio/src/lib.rs
@@ -1,4 +1,4 @@
-#![doc(html_root_url = "https://docs.rs/tokio/0.2.0-alpha.4")]
+#![doc(html_root_url = "https://docs.rs/tokio/0.2.0-alpha.5")]
#![warn(
missing_debug_implementations,
missing_docs,