summaryrefslogtreecommitdiffstats
path: root/tokio-tls
diff options
context:
space:
mode:
authorLucio Franco <luciofranco14@gmail.com>2019-08-08 15:48:53 -0400
committerCarl Lerche <me@carllerche.com>2019-08-08 12:48:53 -0700
commit50e5d401df9931eafabee554bb1a370958fc57d2 (patch)
tree46ee622b3167f98f7cb0dc850e3f2de5e9f7ce87 /tokio-tls
parent2e69f2a7fddfe3d9940ace8ed5610cca83b75369 (diff)
chore: prepare for v0.2.0-alpha.1 release (#1410)
Diffstat (limited to 'tokio-tls')
-rw-r--r--tokio-tls/CHANGELOG.md5
-rw-r--r--tokio-tls/Cargo.toml16
-rw-r--r--tokio-tls/README.md37
-rw-r--r--tokio-tls/src/lib.rs2
4 files changed, 14 insertions, 46 deletions
diff --git a/tokio-tls/CHANGELOG.md b/tokio-tls/CHANGELOG.md
index 60c54fc7..478237e1 100644
--- a/tokio-tls/CHANGELOG.md
+++ b/tokio-tls/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 0.3.0-alpha.1 (August 8, 2019)
+
+### Changed
+- Switch to `async`, `await`, and `std::future`.
+
# 0.2.1 (January 6, 2019)
* Implement `Clone` for `TlsConnector` and `TlsAcceptor` (#777)
diff --git a/tokio-tls/Cargo.toml b/tokio-tls/Cargo.toml
index 56fb1cc0..3d4552c0 100644
--- a/tokio-tls/Cargo.toml
+++ b/tokio-tls/Cargo.toml
@@ -8,33 +8,33 @@ name = "tokio-tls"
# - README.md
# - Update CHANGELOG.md.
# - Create "v0.3.x" git tag.
-version = "0.3.0"
+version = "0.3.0-alpha.1"
edition = "2018"
-authors = ["Carl Lerche <me@carllerche.com>"]
+authors = ["Tokio Contributors <team@tokio.rs>"]
license = "MIT"
repository = "https://github.com/tokio-rs/tokio"
homepage = "https://tokio.rs"
-documentation = "https://docs.rs/tokio-tls/0.2.1/tokio_tls/"
+documentation = "https://docs.rs/tokio-tls/0.3.0-alpha.1/tokio_tls/"
description = """
An implementation of TLS/SSL streams for Tokio giving an implementation of TLS
for nonblocking I/O streams.
"""
categories = ["asynchronous", "network-programming"]
-publish = false
[badges]
travis-ci = { repository = "tokio-rs/tokio-tls" }
[dependencies]
native-tls = "0.2"
-tokio-io = { version = "0.2.0", path = "../tokio-io" }
+tokio-io = { version = "=0.2.0-alpha.1", path = "../tokio-io" }
[dev-dependencies]
-tokio = { version = "0.2.0", path = "../tokio" }
-tokio-tcp = { version = "0.2.0", path = "../tokio-tcp", features = ["async-traits"] }
+tokio = { version = "=0.2.0-alpha.1", path = "../tokio" }
+tokio-tcp = { version = "=0.2.0-alpha.1", path = "../tokio-tcp", features = ["async-traits"] }
+
cfg-if = "0.1"
env_logger = { version = "0.5", default-features = false }
-futures-preview = { version = "0.3.0-alpha.17", features = ["async-await", "nightly"] }
+futures-preview = { version = "=0.3.0-alpha.17", features = ["async-await", "nightly"] }
[target.'cfg(all(not(target_os = "macos"), not(windows), not(target_os = "ios")))'.dev-dependencies]
openssl = "0.10"
diff --git a/tokio-tls/README.md b/tokio-tls/README.md
index f033ae1b..455612be 100644
--- a/tokio-tls/README.md
+++ b/tokio-tls/README.md
@@ -3,43 +3,6 @@
An implementation of TLS/SSL streams for Tokio built on top of the [`native-tls`
crate]
-[Documentation](https://docs.rs/tokio-tls/0.2.1/tokio_tls/)
-
-[`native-tls` crate]: https://github.com/sfackler/rust-native-tls
-
-## Usage
-
-First, add this to your `Cargo.toml`:
-
-```toml
-[dependencies]
-native-tls = "0.2"
-tokio-tls = "0.2"
-```
-
-Next, add this to your crate:
-
-```rust
-use tokio_tls::{TlsConnector, TlsAcceptor};
-```
-
-You can find few examples how to use this crate in examples directory (using TLS in
-hyper server or client).
-
-By default the `native-tls` crate currently uses the "platform appropriate"
-backend for a TLS implementation. This means:
-
-* On Windows, [SChannel] is used
-* On OSX, [SecureTransport] is used
-* Everywhere else, [OpenSSL] is used
-
-[SChannel]: https://msdn.microsoft.com/en-us/library/windows/desktop/aa380123%28v=vs.85%29.aspx?f=255&MSPPError=-2147217396
-[SecureTransport]: https://developer.apple.com/reference/security/1654508-secure_transport
-[OpenSSL]: https://www.openssl.org/
-
-Typically these selections mean that you don't have to worry about a portability
-when using TLS, these libraries are all normally installed by default.
-
## License
This project is licensed under the [MIT license](./LICENSE).
diff --git a/tokio-tls/src/lib.rs b/tokio-tls/src/lib.rs
index b16f0473..80c27f3e 100644
--- a/tokio-tls/src/lib.rs
+++ b/tokio-tls/src/lib.rs
@@ -1,4 +1,4 @@
-#![doc(html_root_url = "https://docs.rs/tokio-tls/0.2.1")]
+#![doc(html_root_url = "https://docs.rs/tokio-tls/0.3.0-alpha.1")]
#![deny(rust_2018_idioms)]
#![cfg_attr(test, deny(warnings))]
#![doc(test(no_crate_inject, attr(deny(rust_2018_idioms))))]