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

build: generate root crate paths correctly (#623)

Browse Source 
We shouldn't append `proto_path` (`super` by default) if the path starts
with `crate::`.

Fixes https://github.com/hyperium/tonic/issues/548
This commit is contained in:
David Pedersen
2021-06-02 16:58:43 +02:00
committed by GitHub
parent 0fa391eca4
commit e82f0b0399
6 changed files with 65 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tonic-build/src/prost.rs
+14 -4
View File
@@ -102,22 +102,28 @@ impl crate::Method for Method {
proto_path: &str,
compile_well_known_types: bool,
) -> (TokenStream, TokenStream) {
let request = if (self.input_proto_type.starts_with(".google.protobuf")
&& !compile_well_known_types)
let request = if (is_google_type(&self.input_proto_type) && !compile_well_known_types)
|| self.input_type.starts_with("::")
{
self.input_type.parse::<TokenStream>().unwrap()
} else if self.input_type.starts_with("crate::") {
syn::parse_str::<syn::Path>(&self.input_type)
.unwrap()
.to_token_stream()
} else {
syn::parse_str::<syn::Path>(&format!("{}::{}", proto_path, self.input_type))
.unwrap()
.to_token_stream()
};
let response = if (self.output_proto_type.starts_with(".google.protobuf")
&& !compile_well_known_types)
let response = if (is_google_type(&self.output_proto_type) && !compile_well_known_types)
|| self.output_type.starts_with("::")
{
self.output_type.parse::<TokenStream>().unwrap()
} else if self.output_type.starts_with("crate::") {
syn::parse_str::<syn::Path>(&self.output_type)
.unwrap()
.to_token_stream()
} else {
syn::parse_str::<syn::Path>(&format!("{}::{}", proto_path, self.output_type))
.unwrap()
@@ -128,6 +134,10 @@ impl crate::Method for Method {
}
}
fn is_google_type(ty: &str) -> bool {
ty.starts_with(".google.protobuf")
}
struct ServiceGenerator {
builder: Builder,
clients: TokenStream,