fix: example conflict

This commit is contained in:
quininer 2018-03-23 17:47:20 +08:00
parent 1820868929
commit d52aecaddd
5 changed files with 34 additions and 8 deletions

View File

@ -22,16 +22,10 @@ webpki = "0.18.0-alpha"
[dev-dependencies]
tokio = "0.1"
# tokio-io = "0.1"
# tokio-core = "0.1"
# tokio-file-unix = "0.4"
clap = "2.26"
webpki-roots = "0.14"
[features]
# default = [ "tokio" ]
default = [ "unstable-futures", "tokio" ]
unstable-futures = [ "futures", "tokio/unstable-futures" ]
[patch.crates-io]
tokio = { path = "../ref/tokio" }
tokio = { git = "https://github.com/tokio-rs/tokio" }

View File

@ -0,0 +1,16 @@
[package]
name = "client"
version = "0.1.0"
authors = ["quininer <quininer@live.com>"]
[dependencies]
rustls = "0.12"
webpki = "0.18.0-alpha"
tokio-rustls = { path = "../..", default-features = false, features = [ "tokio" ] }
tokio = "0.1"
tokio-core = "0.1"
tokio-file-unix = "0.4"
clap = "2.26"
webpki-roots = "0.14"

View File

@ -0,0 +1,17 @@
[package]
name = "server"
version = "0.1.0"
authors = ["quininer <quininer@live.com>"]
[dependencies]
rustls = "0.12"
tokio-rustls = { path = "../..", default-features = false, features = [ "unstable-futures" ] }
tokio = { version = "0.1", features = [ "unstable-futures" ] }
futures = "0.2.0-beta"
clap = "2.26"
[patch.crates-io]
tokio = { git = "https://github.com/tokio-rs/tokio" }

View File

@ -1,7 +1,6 @@
extern crate clap;
extern crate rustls;
extern crate tokio;
extern crate webpki_roots;
extern crate tokio_rustls;
use std::sync::Arc;