From d52aecaddd85aaa10f3571f1414bcd6aac904211 Mon Sep 17 00:00:00 2001
From: quininer <quininer@live.com>
Date: Fri, 23 Mar 2018 17:47:20 +0800
Subject: [PATCH] fix: example conflict

---
 Cargo.toml                                 |  8 +-------
 examples/client/Cargo.toml                 | 16 ++++++++++++++++
 examples/{client.rs => client/src/main.rs} |  0
 examples/server/Cargo.toml                 | 17 +++++++++++++++++
 examples/{server.rs => server/src/main.rs} |  1 -
 5 files changed, 34 insertions(+), 8 deletions(-)
 create mode 100644 examples/client/Cargo.toml
 rename examples/{client.rs => client/src/main.rs} (100%)
 create mode 100644 examples/server/Cargo.toml
 rename examples/{server.rs => server/src/main.rs} (99%)

diff --git a/Cargo.toml b/Cargo.toml
index 89d6b49..dbad35b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -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" }
diff --git a/examples/client/Cargo.toml b/examples/client/Cargo.toml
new file mode 100644
index 0000000..790b018
--- /dev/null
+++ b/examples/client/Cargo.toml
@@ -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"
diff --git a/examples/client.rs b/examples/client/src/main.rs
similarity index 100%
rename from examples/client.rs
rename to examples/client/src/main.rs
diff --git a/examples/server/Cargo.toml b/examples/server/Cargo.toml
new file mode 100644
index 0000000..1516e92
--- /dev/null
+++ b/examples/server/Cargo.toml
@@ -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" }
diff --git a/examples/server.rs b/examples/server/src/main.rs
similarity index 99%
rename from examples/server.rs
rename to examples/server/src/main.rs
index 178ff75..c321048 100644
--- a/examples/server.rs
+++ b/examples/server/src/main.rs
@@ -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;