Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 pbjson-build/src/generator/enumeration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ fn write_visitor<W: Write>(
{indent} type Value = {rust_type};

{indent} fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {{
{indent} write!(formatter, "expected one of: {{:?}}", &FIELDS)
{indent} write!(formatter, "expected one of: {{:?}}", FIELDS)
{indent} }}

{indent} fn visit_i64<E>(self, v: i64) -> std::result::Result<Self::Value, E>
Expand Down
2 changes: 1 addition & 1 deletion pbjson-build/src/generator/message.rs
Original file line number Diff line number Diff line change
Expand Up @@ -710,7 +710,7 @@ fn write_deserialize_field_name<W: Write>(
{indent} type Value = GeneratedField;

{indent} fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {{
{indent} write!(formatter, "expected one of: {{:?}}", &FIELDS)
{indent} write!(formatter, "expected one of: {{:?}}", FIELDS)
{indent} }}

{indent} #[allow(unused_variables)]
Expand Down
54 changes: 54 additions & 0 deletions pbjson-build/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -304,3 +304,57 @@ impl Builder {
Ok(ret)
}
}

#[cfg(test)]
mod tests {
use super::*;
use prost_types::{
DescriptorProto, EnumDescriptorProto, EnumValueDescriptorProto, FieldDescriptorProto,
field_descriptor_proto::{Label, Type},
};

#[test]
fn generated_visitors_format_fields_slice_directly() {
let file = FileDescriptorProto {
package: Some("test".to_string()),
syntax: Some("proto3".to_string()),
message_type: vec![DescriptorProto {
name: Some("Message".to_string()),
field: vec![FieldDescriptorProto {
name: Some("value".to_string()),
number: Some(1),
label: Some(Label::Optional as i32),
r#type: Some(Type::String as i32),
..Default::default()
}],
..Default::default()
}],
enum_type: vec![EnumDescriptorProto {
name: Some("Enumeration".to_string()),
value: vec![EnumValueDescriptorProto {
name: Some("ENUMERATION_UNSPECIFIED".to_string()),
number: Some(0),
..Default::default()
}],
..Default::default()
}],
..Default::default()
};

let generated = Builder::new()
.register_file_descriptor(file)
.generate(&[".test"], |_| Ok(Vec::new()))
.unwrap()
.pop()
.unwrap()
.1;
let generated = String::from_utf8(generated).unwrap();

assert_eq!(
generated
.matches(r#"write!(formatter, "expected one of: {:?}", FIELDS)"#)
.count(),
2
);
}
}