summaryrefslogtreecommitdiffstats
path: root/tokio
diff options
context:
space:
mode:
authorJon Gjengset <jon@thesquareplanet.com>2019-09-30 18:35:52 -0400
committerLucio Franco <luciofranco14@gmail.com>2019-09-30 18:35:52 -0400
commit5efe31f2ed3c797e8055306a05faa3d7e786e7b6 (patch)
treec7aaabac5bd77f9be28ad60a3441f56122a16673 /tokio
parent5ce5a0a0e0fa529a571796d62854a19282848e72 (diff)
Prepare for release of 0.2.0-alpha.6 (#1617)
Note that `tokio-timer` and `tokio-tls` become 0.3.0-alpha.6 (not 0.2.0)
Diffstat (limited to 'tokio')
-rw-r--r--tokio/CHANGELOG.md5
-rw-r--r--tokio/Cargo.toml26
-rw-r--r--tokio/src/lib.rs2
3 files changed, 19 insertions, 14 deletions
diff --git a/tokio/CHANGELOG.md b/tokio/CHANGELOG.md
index 82d42777..5adc8a70 100644
--- a/tokio/CHANGELOG.md
+++ b/tokio/CHANGELOG.md
@@ -1,6 +1,11 @@
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.6 (September 30, 2019)
+
+- Move to `futures-*-preview 0.3.0-alpha.19`
+- Move to `pin-project 0.4`
+
# 0.2.0-alpha.5 (September 19, 2019)
### Changed
diff --git a/tokio/Cargo.toml b/tokio/Cargo.toml
index ec43d265..b1f463a6 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.5"
+version = "0.2.0-alpha.6"
edition = "2018"
authors = ["Tokio Contributors <team@tokio.rs>"]
license = "MIT"
readme = "README.md"
-documentation = "https://docs.rs/tokio/0.2.0-alpha.5/tokio/"
+documentation = "https://docs.rs/tokio/0.2.0-alpha.6/tokio/"
repository = "https://github.com/tokio-rs/tokio"
homepage = "https://tokio.rs"
description = """
@@ -71,22 +71,22 @@ futures-util-preview = { version = "=0.3.0-alpha.19", 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.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"] }
+tokio-codec = { version = "=0.2.0-alpha.6", optional = true, path = "../tokio-codec" }
+tokio-fs = { version = "=0.2.0-alpha.6", optional = true, path = "../tokio-fs" }
+tokio-io = { version = "=0.2.0-alpha.6", optional = true, features = ["util"], path = "../tokio-io" }
+tokio-executor = { version = "=0.2.0-alpha.6", optional = true, path = "../tokio-executor" }
+tokio-macros = { version = "=0.2.0-alpha.6", optional = true, path = "../tokio-macros" }
+tokio-net = { version = "=0.2.0-alpha.6", optional = true, features = ["async-traits"], path = "../tokio-net" }
+tokio-sync = { version = "=0.2.0-alpha.6", optional = true, path = "../tokio-sync", features = ["async-traits"] }
+tokio-timer = { version = "=0.3.0-alpha.6", 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.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"] }
+tokio-net = { version = "=0.2.0-alpha.6", optional = true, path = "../tokio-net", features = ["tracing", "async-traits"] }
+tokio-executor = { version = "=0.2.0-alpha.6", optional = true, path = "../tokio-executor", features = ["tracing"] }
[dev-dependencies]
-tokio-test = { version = "=0.2.0-alpha.5", path = "../tokio-test" }
+tokio-test = { version = "=0.2.0-alpha.6", path = "../tokio-test" }
futures-preview = "=0.3.0-alpha.19"
futures-util-preview = "=0.3.0-alpha.19"
diff --git a/tokio/src/lib.rs b/tokio/src/lib.rs
index 14a7a3ab..981ecbaf 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.5")]
+#![doc(html_root_url = "https://docs.rs/tokio/0.2.0-alpha.6")]
#![warn(
missing_debug_implementations,
missing_docs,