From 6673f91f1fba40581865debf76c5719f3c58803f Mon Sep 17 00:00:00 2001
From: Lucio Franco <luciofranco14@gmail.com>
Date: Sat, 11 Jan 2020 12:48:24 -0800
Subject: [PATCH] chore: Remove required bytes dep and clean up deny (#227)

* chore: Remove required bytes dep and clean up deny

* Fix interop test cli args
---
 deny.toml                         | 9 +++------
 examples/Cargo.toml               | 3 +--
 examples/helloworld-tutorial.md   | 1 -
 examples/routeguide-tutorial.md   | 1 -
 interop/Cargo.toml                | 2 +-
 interop/src/bin/client.rs         | 8 ++++----
 interop/src/bin/server.rs         | 2 +-
 tests/included_service/Cargo.toml | 1 -
 tests/same_name/Cargo.toml        | 1 -
 tests/wellknown/Cargo.toml        | 1 -
 tonic/Cargo.toml                  | 2 +-
 11 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/deny.toml b/deny.toml
index 6a3b18e..0d2423a 100644
--- a/deny.toml
+++ b/deny.toml
@@ -14,12 +14,9 @@ deny = [
     # term is not fully maintained, and termcolor is replacing it
     { name = "term" },
 ]
-skip = [
-    { name = "bytes", version = "=0.4.12" },
-]
-skip-tree = [
-    { name = "rand", version = "=0.6.5" },
-    { name = "syn",  version = "=0.15.44" },
+skip-tree = [ 
+    { name = "winapi", version = "<= 0.3" },
+    { name = "autocfg", version = "<= 1" },
 ]
 
 [licenses]
diff --git a/examples/Cargo.toml b/examples/Cargo.toml
index be05b72..39f6735 100644
--- a/examples/Cargo.toml
+++ b/examples/Cargo.toml
@@ -88,7 +88,6 @@ path = "src/uds/server.rs"
 
 [dependencies]
 tonic = { path = "../tonic", features = ["tls"] }
-bytes = "0.5"
 prost = { git = "https://github.com/danburkert/prost", branch = "master" }
 
 tokio = { version = "0.2", features = ["rt-threaded", "time", "stream", "fs", "macros", "uds"] }
@@ -100,7 +99,7 @@ tower = "0.3"
 # Required for routeguide
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-rand = "0.6"
+rand = "0.7"
 
 # Tracing
 tracing = "0.1"
diff --git a/examples/helloworld-tutorial.md b/examples/helloworld-tutorial.md
index 67386c7..199a360 100644
--- a/examples/helloworld-tutorial.md
+++ b/examples/helloworld-tutorial.md
@@ -114,7 +114,6 @@ path = "src/client.rs"
 
 [dependencies]
 tonic = "0.1.0-beta.1"
-bytes = "0.5"
 prost = { git = "https://github.com/danburkert/prost", branch = "master" }
 tokio = { version = "0.2", features = ["macros"] }
 
diff --git a/examples/routeguide-tutorial.md b/examples/routeguide-tutorial.md
index 923af47..e95a0a7 100644
--- a/examples/routeguide-tutorial.md
+++ b/examples/routeguide-tutorial.md
@@ -181,7 +181,6 @@ Edit `Cargo.toml` and add all the dependencies we'll need for this example:
 ```toml
 [dependencies]
 tonic = "0.1.0-beta.1"
-bytes = "0.5"
 prost = { git = "https://github.com/danburkert/prost", branch = "master" }
 futures-core = "0.3"
 futures-util = "0.3"
diff --git a/interop/Cargo.toml b/interop/Cargo.toml
index 34a5666..4d29c83 100644
--- a/interop/Cargo.toml
+++ b/interop/Cargo.toml
@@ -28,7 +28,7 @@ tower = "0.3"
 http-body = "0.3"
 
 console = "0.9"
-structopt = "0.2"
+structopt = "0.3"
 
 tracing = "0.1"
 tracing-subscriber = "0.2.0-alpha"
diff --git a/interop/src/bin/client.rs b/interop/src/bin/client.rs
index a4c13d0..f45782c 100644
--- a/interop/src/bin/client.rs
+++ b/interop/src/bin/client.rs
@@ -6,16 +6,16 @@ use tonic_interop::client;
 
 #[derive(StructOpt)]
 struct Opts {
+    #[structopt(name = "use_tls", long)]
+    use_tls: bool,
+
     #[structopt(
         long = "test_case",
         use_delimiter = true,
         min_values = 1,
-        raw(possible_values = r#"&Testcase::variants()"#)
+        possible_values = &Testcase::variants()
     )]
     test_case: Vec<Testcase>,
-
-    #[structopt(long)]
-    use_tls: bool,
 }
 
 #[tokio::main]
diff --git a/interop/src/bin/server.rs b/interop/src/bin/server.rs
index d8aec08..285a1e7 100644
--- a/interop/src/bin/server.rs
+++ b/interop/src/bin/server.rs
@@ -8,7 +8,7 @@ use tonic_interop::{server, MergeTrailers};
 
 #[derive(StructOpt)]
 struct Opts {
-    #[structopt(long)]
+    #[structopt(name = "use_tls", long)]
     use_tls: bool,
 }
 
diff --git a/tests/included_service/Cargo.toml b/tests/included_service/Cargo.toml
index 9b882df..b8dba7b 100644
--- a/tests/included_service/Cargo.toml
+++ b/tests/included_service/Cargo.toml
@@ -10,7 +10,6 @@ license = "MIT"
 
 [dependencies]
 tonic = { path = "../../tonic" }
-bytes = "0.5"
 prost = { git = "https://github.com/danburkert/prost", branch = "master" }
 
 [build-dependencies]
diff --git a/tests/same_name/Cargo.toml b/tests/same_name/Cargo.toml
index 293c702..ec76b60 100644
--- a/tests/same_name/Cargo.toml
+++ b/tests/same_name/Cargo.toml
@@ -10,7 +10,6 @@ license = "MIT"
 
 [dependencies]
 tonic = { path = "../../tonic" }
-bytes = "0.5"
 prost = { git = "https://github.com/danburkert/prost", branch = "master" }
 
 [build-dependencies]
diff --git a/tests/wellknown/Cargo.toml b/tests/wellknown/Cargo.toml
index 8f37aa9..1541321 100644
--- a/tests/wellknown/Cargo.toml
+++ b/tests/wellknown/Cargo.toml
@@ -10,7 +10,6 @@ license = "MIT"
 
 [dependencies]
 tonic = { path = "../../tonic" }
-bytes = "0.5"
 prost = { git = "https://github.com/danburkert/prost", branch = "master" }
 prost-types = { git = "https://github.com/danburkert/prost", branch = "master" }
 
diff --git a/tonic/Cargo.toml b/tonic/Cargo.toml
index 2738769..a4c2bde 100644
--- a/tonic/Cargo.toml
+++ b/tonic/Cargo.toml
@@ -78,7 +78,7 @@ rustls-native-certs = { version = "0.1", optional = true }
 [dev-dependencies]
 tokio = { version = "0.2", features = ["rt-core", "macros"] }
 static_assertions = "1.0"
-rand = "0.6"
+rand = "0.7"
 bencher = "0.1.5"
 
 [package.metadata.docs.rs]