Merge pull request #30 from boydjohnson/bump-outdated

Bump tonic, tonic-build to 0.7, bump heck
adamrk · Sep 19, 2022 · 201eaab · 201eaab
2 parents a80c65f + 4d5cc93
commit 201eaab
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 16 deletions.
diff --git a/example/Cargo.toml b/example/Cargo.toml
@@ -10,5 +10,5 @@ license = "MIT"
 [dependencies]
 tokio = { version = "1.0", features = [ "full" ] }
 tokio-stream = { version = "0.1", features = [ "net" ] }
-tonic = "0.4"
+tonic = "0.7"
 tonic-rpc = { path = "../tonic-rpc" }
diff --git a/tonic-rpc-macro/Cargo.toml b/tonic-rpc-macro/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tonic-rpc-macro"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Adam Bratschi-Kaye <ark.email@gmail.com>"]
 edition = "2018"
 license = "MIT"
@@ -16,9 +16,9 @@ Core macro for tonic-rpc.
 proc-macro = true
 
 [dependencies]
-heck = "0.3"
+heck = "0.4"
 itertools = "0.10"
 syn = { version = "1.0", features = ["full"] }
-tonic-build = "0.4"
+tonic-build = "0.7"
 proc-macro2 = "1.0"
 quote = "1.0"
diff --git a/tonic-rpc-macro/src/lib.rs b/tonic-rpc-macro/src/lib.rs
@@ -4,7 +4,7 @@ use syn::{
     parse_macro_input, punctuated::Pair, FnArg, ItemTrait, ReturnType, TraitItem, TraitItemMethod,
     Type,
 };
-use tonic_build::{Method, Service};
+use tonic_build::{Attributes, Method, Service};
 
 struct RustDefMethod {
     pub name: String,
@@ -213,7 +213,7 @@ fn make_method<T: From<RustDefMethod>>(method: TraitItemMethod, trait_name: &str
         quote::format_ident!("__tonic_generated_{}_{}_response", trait_name, name);
 
     RustDefMethod {
-        identifier: heck::CamelCase::to_camel_case(name.as_str()),
+        identifier: heck::ToUpperCamelCase::to_upper_camel_case(name.as_str()),
         name,
         client_streaming,
         server_streaming,
@@ -247,8 +247,8 @@ where
         name,
         methods,
     };
-    let client = tonic_build::client::generate(&service, false, "", false);
-    let server = tonic_build::server::generate(&service, false, "", false);
+    let client = tonic_build::client::generate(&service, false, "", false, &Attributes::default());
+    let server = tonic_build::server::generate(&service, false, "", false, &Attributes::default());
     let types = service.methods.iter().map(|m| {
         let request_name = m.generated_request();
         let response_name = m.generated_response();

diff --git a/tonic-rpc/Cargo.toml b/tonic-rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tonic-rpc"
-version = "0.1.1"
+version = "0.2.0"
 authors = ["Adam Bratschi-Kaye <ark.email@gmail.com>"]
 edition = "2018"
 license = "MIT"
@@ -24,12 +24,12 @@ messagepack = ["rmp-serde"]
 [dependencies]
 bytes = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-tonic = "0.4"
-tonic-rpc-macro = { version = "0.1", path = "../tonic-rpc-macro" }
+tonic = "0.7"
+tonic-rpc-macro = { version = "0.2", path = "../tonic-rpc-macro" }
 
 # optional codecs
 bincode = { version = "1.3", optional = true }
-rmp-serde = { version = "0.15", optional = true }
+rmp-serde = { version = "1.1", optional = true }
 serde_json = { version = "1.0", optional = true }
 serde_cbor = { version = "0.11", optional = true }
 
@@ -39,7 +39,7 @@ tokio = { version = "1.4", features = [ "full" ] }
 tokio-stream = { version = "0.1", features = [ "net" ] }
 
 [build-dependencies]
-tonic-build = "0.4"
+tonic-build = "0.7"
 
 # docs.rs-specific configuration
 [package.metadata.docs.rs]

diff --git a/tonic-rpc/tests/util/mod.rs b/tonic-rpc/tests/util/mod.rs
@@ -1,4 +1,4 @@
-use std::{error::Error};
+use std::convert::Infallible;
 
 use tokio::net::TcpListener;
 use tokio_stream::wrappers::TcpListenerStream;
@@ -14,9 +14,12 @@ use tonic::{
 /// Returns the address to connect to.
 pub async fn run_server<S>(svc: S) -> String
 where
-    S: Service<Request<Body>, Response = Response<BoxBody>> + NamedService + Clone + Send + 'static,
+    S: Service<Request<Body>, Response = Response<BoxBody>, Error = Infallible>
+        + NamedService
+        + Clone
+        + Send
+        + 'static,
     S::Future: Send + 'static,
-    S::Error: Error + Send + Sync,
 {
     let listener = TcpListener::bind("[::1]:0").await.unwrap();
     let port = listener.local_addr().unwrap().port();