talksik/tonic
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(codegen): Use wellknown types from prost-types (#49)

Browse Source 
This change introduces the ability to let prost-build
provide the fully qualifed type path for types that
start with `google.protobuf`.
This commit is contained in:
Lucio Franco
2019-10-05 13:16:09 -04:00
committed by GitHub
parent ed3e7e95a5
commit 4e1fcece15
6 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tonic-build/src/server.rs
+5 -10
View File
@@ -114,8 +114,7 @@ fn generate_trait_methods(service: &Service, proto_path: &str) -> TokenStream {
for method in &service.methods {
let name = quote::format_ident!("{}", method.name);
let req_message = crate::replace_wellknown(proto_path, &method.input_type);
let res_message = crate::replace_wellknown(proto_path, &method.output_type);
let (req_message, res_message) = crate::replace_wellknown(proto_path, &method);
let method_doc = generate_doc_comments(&method.comments.leading);
@@ -226,8 +225,7 @@ fn generate_unary(
) -> TokenStream {
let service_ident = Ident::new(&method.proto_name, Span::call_site());
let request = crate::replace_wellknown(proto_path, &method.input_type);
let response = crate::replace_wellknown(proto_path, &method.output_type);
let (request, response) = crate::replace_wellknown(proto_path, &method);
quote! {
struct #service_ident<T: #server_trait >(pub Arc<T>);
@@ -266,8 +264,7 @@ fn generate_server_streaming(
) -> TokenStream {
let service_ident = Ident::new(&method.proto_name, Span::call_site());
let request = crate::replace_wellknown(proto_path, &method.input_type);
let response = crate::replace_wellknown(proto_path, &method.output_type);
let (request, response) = crate::replace_wellknown(proto_path, &method);
let response_stream = quote::format_ident!("{}Stream", method.proto_name);
@@ -310,8 +307,7 @@ fn generate_client_streaming(
) -> TokenStream {
let service_ident = Ident::new(&method.proto_name, Span::call_site());
let request = crate::replace_wellknown(proto_path, &method.input_type);
let response = crate::replace_wellknown(proto_path, &method.output_type);
let (request, response) = crate::replace_wellknown(proto_path, &method);
quote! {
struct #service_ident<T: #server_trait >(pub Arc<T>);
@@ -352,8 +348,7 @@ fn generate_streaming(
) -> TokenStream {
let service_ident = Ident::new(&method.proto_name, Span::call_site());
let request = crate::replace_wellknown(proto_path, &method.input_type);
let response = crate::replace_wellknown(proto_path, &method.output_type);
let (request, response) = crate::replace_wellknown(proto_path, &method);
let response_stream = quote::format_ident!("{}Stream", method.proto_name);