fix: example conflict
This commit is contained in:
parent
1820868929
commit
d52aecaddd
@ -22,16 +22,10 @@ webpki = "0.18.0-alpha"
|
|||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
tokio = "0.1"
|
tokio = "0.1"
|
||||||
# tokio-io = "0.1"
|
|
||||||
# tokio-core = "0.1"
|
|
||||||
# tokio-file-unix = "0.4"
|
|
||||||
clap = "2.26"
|
|
||||||
webpki-roots = "0.14"
|
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
# default = [ "tokio" ]
|
|
||||||
default = [ "unstable-futures", "tokio" ]
|
default = [ "unstable-futures", "tokio" ]
|
||||||
unstable-futures = [ "futures", "tokio/unstable-futures" ]
|
unstable-futures = [ "futures", "tokio/unstable-futures" ]
|
||||||
|
|
||||||
[patch.crates-io]
|
[patch.crates-io]
|
||||||
tokio = { path = "../ref/tokio" }
|
tokio = { git = "https://github.com/tokio-rs/tokio" }
|
||||||
|
16
examples/client/Cargo.toml
Normal file
16
examples/client/Cargo.toml
Normal 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"
|
17
examples/server/Cargo.toml
Normal file
17
examples/server/Cargo.toml
Normal 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" }
|
@ -1,7 +1,6 @@
|
|||||||
extern crate clap;
|
extern crate clap;
|
||||||
extern crate rustls;
|
extern crate rustls;
|
||||||
extern crate tokio;
|
extern crate tokio;
|
||||||
extern crate webpki_roots;
|
|
||||||
extern crate tokio_rustls;
|
extern crate tokio_rustls;
|
||||||
|
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
Loading…
Reference in New Issue
Block a user