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: add double quotes for default binary value #249

Merged
merged 1 commit into from
May 28, 2024
Merged

fix: add double quotes for default binary value #249

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pilota-build/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pilota-build"
version = "0.11.5"
version = "0.11.6"
edition = "2021"
description = "Compile thrift and protobuf idl into rust code at compile-time."
documentation = "https://docs.rs/pilota-build"
Expand Down
2 changes: 1 addition & 1 deletion pilota-build/src/middle/context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,7 @@ impl Context {
(Literal::String(s), CodegenTy::Bytes) => {
let s = &**s;
(
format! { "::bytes::Bytes::from_static({s}.as_bytes())" }.into(),
format! { "::pilota::Bytes::from_static(\"{s}\".as_bytes())" }.into(),
true,
)
}
Expand Down
20 changes: 20 additions & 0 deletions pilota-build/test_data/thrift/default_value.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,7 @@ pub mod default_value {
test_double: Some(1f64),
test_double2: Some(1.2f64),
alias_str: Some(::pilota::FastStr::from_static_str(A_S)),
empty: ::pilota::Bytes::from_static("".as_bytes()),
}
}
}
Expand All @@ -307,6 +308,8 @@ pub mod default_value {
pub test_double2: ::std::option::Option<f64>,

pub alias_str: ::std::option::Option<::pilota::FastStr>,

pub empty: ::pilota::Bytes,
}
impl ::pilota::thrift::Message for A {
fn encode<T: ::pilota::thrift::TOutputProtocol>(
Expand Down Expand Up @@ -357,6 +360,7 @@ pub mod default_value {
if let Some(value) = self.alias_str.as_ref() {
protocol.write_faststr_field(9, (value).clone())?;
}
protocol.write_bytes_field(10, (&self.empty).clone())?;
protocol.write_field_stop()?;
protocol.write_struct_end()?;
::std::result::Result::Ok(())
Expand All @@ -378,6 +382,7 @@ pub mod default_value {
let mut test_double = Some(1f64);
let mut test_double2 = Some(1.2f64);
let mut alias_str = Some(::pilota::FastStr::from_static_str(A_S));
let mut empty = ::pilota::Bytes::from_static("".as_bytes());

let mut __pilota_decoding_field_id = None;

Expand Down Expand Up @@ -444,6 +449,11 @@ pub mod default_value {
{
alias_str = Some(protocol.read_faststr()?);
}
Some(10)
if field_ident.field_type == ::pilota::thrift::TType::Binary =>
{
empty = protocol.read_bytes()?;
}
_ => {
protocol.skip(field_ident.field_type)?;
}
Expand Down Expand Up @@ -487,6 +497,7 @@ pub mod default_value {
test_double,
test_double2,
alias_str,
empty,
};
::std::result::Result::Ok(data)
}
Expand All @@ -512,6 +523,7 @@ pub mod default_value {
let mut test_double = Some(1f64);
let mut test_double2 = Some(1.2f64);
let mut alias_str = Some(::pilota::FastStr::from_static_str(A_S));
let mut empty = ::pilota::Bytes::from_static("".as_bytes());

let mut __pilota_decoding_field_id = None;

Expand Down Expand Up @@ -598,6 +610,12 @@ pub mod default_value {
{
alias_str = Some(protocol.read_faststr().await?);
}
Some(10)
if field_ident.field_type
== ::pilota::thrift::TType::Binary =>
{
empty = protocol.read_bytes().await?;
}
_ => {
protocol.skip(field_ident.field_type).await?;
}
Expand Down Expand Up @@ -642,6 +660,7 @@ pub mod default_value {
test_double,
test_double2,
alias_str,
empty,
};
::std::result::Result::Ok(data)
})
Expand Down Expand Up @@ -691,6 +710,7 @@ pub mod default_value {
.alias_str
.as_ref()
.map_or(0, |value| protocol.faststr_field_len(Some(9), value))
+ protocol.bytes_field_len(Some(10), &self.empty)
+ protocol.field_stop_len()
+ protocol.struct_end_len()
}
Expand Down
1 change: 1 addition & 0 deletions pilota-build/test_data/thrift/default_value.thrift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ struct A {
7: optional double test_double = 1,
8: optional double test_double2 = 1.2,
9: optional string alias_str = A_S,
10: required binary empty = "",
}

struct C {
Expand Down
20 changes: 20 additions & 0 deletions pilota-build/test_data/thrift/multi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,7 @@ pub mod multi {
test_double: Some(1f64),
test_double2: Some(1.2f64),
alias_str: Some(::pilota::FastStr::from_static_str(A_S)),
empty: ::pilota::Bytes::from_static("".as_bytes()),
}
}
}
Expand All @@ -309,6 +310,8 @@ pub mod multi {
pub test_double2: ::std::option::Option<f64>,

pub alias_str: ::std::option::Option<::pilota::FastStr>,

pub empty: ::pilota::Bytes,
}
impl ::pilota::thrift::Message for A {
fn encode<T: ::pilota::thrift::TOutputProtocol>(
Expand Down Expand Up @@ -359,6 +362,7 @@ pub mod multi {
if let Some(value) = self.alias_str.as_ref() {
protocol.write_faststr_field(9, (value).clone())?;
}
protocol.write_bytes_field(10, (&self.empty).clone())?;
protocol.write_field_stop()?;
protocol.write_struct_end()?;
::std::result::Result::Ok(())
Expand All @@ -380,6 +384,7 @@ pub mod multi {
let mut test_double = Some(1f64);
let mut test_double2 = Some(1.2f64);
let mut alias_str = Some(::pilota::FastStr::from_static_str(A_S));
let mut empty = ::pilota::Bytes::from_static("".as_bytes());

let mut __pilota_decoding_field_id = None;

Expand Down Expand Up @@ -446,6 +451,11 @@ pub mod multi {
{
alias_str = Some(protocol.read_faststr()?);
}
Some(10)
if field_ident.field_type == ::pilota::thrift::TType::Binary =>
{
empty = protocol.read_bytes()?;
}
_ => {
protocol.skip(field_ident.field_type)?;
}
Expand Down Expand Up @@ -489,6 +499,7 @@ pub mod multi {
test_double,
test_double2,
alias_str,
empty,
};
::std::result::Result::Ok(data)
}
Expand All @@ -514,6 +525,7 @@ pub mod multi {
let mut test_double = Some(1f64);
let mut test_double2 = Some(1.2f64);
let mut alias_str = Some(::pilota::FastStr::from_static_str(A_S));
let mut empty = ::pilota::Bytes::from_static("".as_bytes());

let mut __pilota_decoding_field_id = None;

Expand Down Expand Up @@ -600,6 +612,12 @@ pub mod multi {
{
alias_str = Some(protocol.read_faststr().await?);
}
Some(10)
if field_ident.field_type
== ::pilota::thrift::TType::Binary =>
{
empty = protocol.read_bytes().await?;
}
_ => {
protocol.skip(field_ident.field_type).await?;
}
Expand Down Expand Up @@ -644,6 +662,7 @@ pub mod multi {
test_double,
test_double2,
alias_str,
empty,
};
::std::result::Result::Ok(data)
})
Expand Down Expand Up @@ -693,6 +712,7 @@ pub mod multi {
.alias_str
.as_ref()
.map_or(0, |value| protocol.faststr_field_len(Some(9), value))
+ protocol.bytes_field_len(Some(10), &self.empty)
+ protocol.field_stop_len()
+ protocol.struct_end_len()
}
Expand Down
Loading