Skip to content

prost-build: prost_path helper function #1018

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

Merged
merged 1 commit into from
Apr 8, 2024
Merged

prost-build: prost_path helper function #1018

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 10 additions & 7 deletions prost-build/src/code_generator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ fn push_indent(buf: &mut String, depth: u8) {
buf.push_str(" ");
}
}

fn prost_path(config: &Config) -> &str {
config.prost_path.as_deref().unwrap_or("::prost")
}

impl<'a> CodeGenerator<'a> {
pub fn generate(
config: &mut Config,
Expand Down Expand Up @@ -183,7 +188,7 @@ impl<'a> CodeGenerator<'a> {
.push_str("#[allow(clippy::derive_partial_eq_without_eq)]\n");
self.buf.push_str(&format!(
"#[derive(Clone, PartialEq, {}::Message)]\n",
self.config.prost_path.as_deref().unwrap_or("::prost")
prost_path(self.config)
));
self.append_skip_debug(&fq_message_name);
self.push_indent();
Expand Down Expand Up @@ -473,7 +478,7 @@ impl<'a> CodeGenerator<'a> {
self.buf.push_str(&to_snake(field.name()));
self.buf.push_str(": ");

let prost_path = self.config.prost_path.as_deref().unwrap_or("::prost");
let prost_path = prost_path(self.config);

if repeated {
self.buf
Expand Down Expand Up @@ -594,7 +599,7 @@ impl<'a> CodeGenerator<'a> {
.push_str("#[allow(clippy::derive_partial_eq_without_eq)]\n");
self.buf.push_str(&format!(
"#[derive(Clone, PartialEq, {}::Oneof)]\n",
self.config.prost_path.as_deref().unwrap_or("::prost")
prost_path(self.config)
));
self.append_skip_debug(&fq_message_name);
self.push_indent();
Expand Down Expand Up @@ -712,7 +717,7 @@ impl<'a> CodeGenerator<'a> {
self.buf.push_str(&format!(
"#[derive(Clone, Copy, {}PartialEq, Eq, Hash, PartialOrd, Ord, {}::Enumeration)]\n",
dbg,
self.config.prost_path.as_deref().unwrap_or("::prost"),
prost_path(self.config),
));
self.push_indent();
self.buf.push_str("#[repr(i32)]\n");
Expand Down Expand Up @@ -924,8 +929,6 @@ impl<'a> CodeGenerator<'a> {
}

fn resolve_type(&self, field: &FieldDescriptorProto, fq_message_name: &str) -> String {
let prost_path = self.config.prost_path.as_deref().unwrap_or("::prost");

match field.r#type() {
Type::Float => String::from("f32"),
Type::Double => String::from("f64"),
Expand All @@ -934,7 +937,7 @@ impl<'a> CodeGenerator<'a> {
Type::Int32 | Type::Sfixed32 | Type::Sint32 | Type::Enum => String::from("i32"),
Type::Int64 | Type::Sfixed64 | Type::Sint64 => String::from("i64"),
Type::Bool => String::from("bool"),
Type::String => format!("{}::alloc::string::String", prost_path),
Type::String => format!("{}::alloc::string::String", prost_path(self.config)),
Type::Bytes => self
.config
.bytes_type
Expand Down