fix(build): Fix service and rpc name conflict (#92)

Closes #89

tonic-build/src/server.rs

@@ -223,7 +223,7 @@ fn generate_unary(
     proto_path: &str,
     server_trait: Ident,
 ) -> TokenStream {
-    let service_ident = Ident::new(&method.proto_name, Span::call_site());
+    let service_ident = quote::format_ident!("{}Svc", method.proto_name);
 
     let (request, response) = crate::replace_wellknown(proto_path, &method);
 
@@ -262,7 +262,7 @@ fn generate_server_streaming(
     proto_path: &str,
     server_trait: Ident,
 ) -> TokenStream {
-    let service_ident = Ident::new(&method.proto_name, Span::call_site());
+    let service_ident = quote::format_ident!("{}Svc", method.proto_name);
 
     let (request, response) = crate::replace_wellknown(proto_path, &method);
 
@@ -305,7 +305,7 @@ fn generate_client_streaming(
     proto_path: &str,
     server_trait: Ident,
 ) -> TokenStream {
-    let service_ident = Ident::new(&method.proto_name, Span::call_site());
+    let service_ident = quote::format_ident!("{}Svc", method.proto_name);
 
     let (request, response) = crate::replace_wellknown(proto_path, &method);
 
@@ -346,7 +346,7 @@ fn generate_streaming(
     proto_path: &str,
     server_trait: Ident,
 ) -> TokenStream {
-    let service_ident = Ident::new(&method.proto_name, Span::call_site());
+    let service_ident = quote::format_ident!("{}Svc", method.proto_name);
 
     let (request, response) = crate::replace_wellknown(proto_path, &method);
 

tonic-build/tests/protos/wellknown.proto

@@ -1,13 +0,0 @@
-syntax = "proto3";
-
-package wellknown;
-
-import "google/protobuf/empty.proto";
-import "google/protobuf/wrappers.proto";
-import "google/protobuf/any.proto";
-
-service Admin {
-  rpc EmptyCall(google.protobuf.Empty) returns (google.protobuf.Empty);
-  rpc StringCall(google.protobuf.StringValue) returns (google.protobuf.Empty);
-  rpc AnyCall(google.protobuf.Any) returns (google.protobuf.Empty);
-}

tonic-build/tests/wellknown.rs

@@ -1,12 +0,0 @@
-#[test]
-fn wellknown() {
-    let tmp = std::env::temp_dir();
-    tonic_build::configure()
-        .out_dir(tmp)
-        .format(false)
-        .type_attribute(".", "#[derive(Serialize, Deserialize)]")
-        .type_attribute(".", "#[serde(rename_all = \"camelCase\")]")
-        .field_attribute("in", "#[serde(rename = \"in\")]")
-        .compile(&["tests/protos/wellknown.proto"], &["tests/protos"])
-        .unwrap();
-}