Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(build): Don't replace extern_paths #261

Merged
merged 5 commits into from
Feb 18, 2020
Merged

fix(build): Don't replace extern_paths #261

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2361b24
don't replace extern_path'd paths
danny-osmos Feb 6, 2020
6a16fd5
add doc in tonic-build clarifying extern_path
danny-osmos Feb 11, 2020
f8892cd
Merge branch 'master' into extern_path
danny-osmos Feb 18, 2020
936e4a2
add test cast case for extern path fix
danny-osmos Feb 18, 2020
7bf65a4
add license/publish to extern_path test crates
danny-osmos Feb 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions tonic-build/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ impl Builder {
/// Declare externally provided Protobuf package or type.
///
/// Passed directly to `prost_build::Config.extern_path`.
/// Note that both the Protobuf path and the rust package paths should both be fully qualified.
/// i.e. Protobuf paths should start with "." and rust paths should start with "::"
pub fn extern_path(mut self, proto_path: impl AsRef<str>, rust_path: impl AsRef<str>) -> Self {
self.extern_path.push((
proto_path.as_ref().to_string(),
Expand Down Expand Up @@ -318,15 +320,19 @@ fn generate_doc_comments<T: AsRef<str>>(comments: &[T]) -> TokenStream {
}

fn replace_wellknown(proto_path: &str, method: &Method) -> (TokenStream, TokenStream) {
let request = if method.input_proto_type.starts_with(".google.protobuf") {
let request = if method.input_proto_type.starts_with(".google.protobuf")
|| method.input_type.starts_with("::")
{
method.input_type.parse::<TokenStream>().unwrap()
} else {
syn::parse_str::<syn::Path>(&format!("{}::{}", proto_path, method.input_type))
.unwrap()
.to_token_stream()
};

let response = if method.output_proto_type.starts_with(".google.protobuf") {
let response = if method.output_proto_type.starts_with(".google.protobuf")
|| method.output_type.starts_with("::")
{
method.output_type.parse::<TokenStream>().unwrap()
} else {
syn::parse_str::<syn::Path>(&format!("{}::{}", proto_path, method.output_type))
Expand Down