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

fix(build): Correctly convert Empty to () (#734)

Browse Source
This commit is contained in:
Tom Dyas
2021-10-22 08:44:27 -04:00
committed by GitHub
parent 4947b076f5
commit ff6a690cec
5 changed files with 53 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tonic-build/src/prost.rs
+20 -26
View File
@@ -49,6 +49,9 @@ pub fn compile_protos(proto: impl AsRef<Path>) -> io::Result<()> {
const PROST_CODEC_PATH: &str = "tonic::codec::ProstCodec";
/// Non-path Rust types allowed for request/response types.
const NON_PATH_TYPE_ALLOWLIST: &[&str] = &["()"];
impl crate::Service for Service {
const CODEC_PATH: &'static str = PROST_CODEC_PATH;
@@ -105,34 +108,25 @@ impl crate::Method for Method {
proto_path: &str,
compile_well_known_types: bool,
) -> (TokenStream, TokenStream) {
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 (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()
.to_token_stream()
let convert_type = |proto_type: &str, rust_type: &str| -> TokenStream {
if (is_google_type(proto_type) && !compile_well_known_types)
|| rust_type.starts_with("::")
|| NON_PATH_TYPE_ALLOWLIST.iter().any(|ty| *ty == rust_type)
{
rust_type.parse::<TokenStream>().unwrap()
} else if rust_type.starts_with("crate::") {
syn::parse_str::<syn::Path>(rust_type)
.unwrap()
.to_token_stream()
} else {
syn::parse_str::<syn::Path>(&format!("{}::{}", proto_path, rust_type))
.unwrap()
.to_token_stream()
}
};
let request = convert_type(&self.input_proto_type, &self.input_type);
let response = convert_type(&self.output_proto_type, &self.output_type);
(request, response)
}
}