Skip to content

Commit

Permalink
fix: use rust_name of field in error hint
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ggiggle
Ggiggle committed Sep 18, 2024
1 parent c985662 commit d823c9a
Show file tree
Hide file tree
Showing 17 changed files with 457 additions and 457 deletions.
6 changes: 3 additions & 3 deletions pilota-build/src/codegen/thrift/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,14 +256,14 @@ impl ThriftBackend {
.fields
.iter()
.filter(|f| !f.is_optional() && self.default_val(f).is_none())
.map(|f| f.local_var_name())
.map(|f| (self.rust_name(f.did), f.local_var_name()))
.collect_vec();

let verify_required_fields = required_without_default_fields
.iter()
.map(|s| {
.map(|(s, v)| {
format!(
r#"let Some({s}) = {s} else {{
r#"let Some({v}) = {v} else {{
return ::std::result::Result::Err(
::pilota::thrift::new_protocol_exception(
::pilota::thrift::ProtocolExceptionKind::InvalidData,
Expand Down
8 changes: 4 additions & 4 deletions pilota-build/test_data/plugin/serde.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,13 @@ pub mod serde {
let Some(var_1) = var_1 else {
return ::std::result::Result::Err(::pilota::thrift::new_protocol_exception(
::pilota::thrift::ProtocolExceptionKind::InvalidData,
"field var_1 is required".to_string(),
"field a is required".to_string(),
));
};
let Some(var_2) = var_2 else {
return ::std::result::Result::Err(::pilota::thrift::new_protocol_exception(
::pilota::thrift::ProtocolExceptionKind::InvalidData,
"field var_2 is required".to_string(),
"field b is required".to_string(),
));
};

Expand Down Expand Up @@ -167,15 +167,15 @@ pub mod serde {
return ::std::result::Result::Err(
::pilota::thrift::new_protocol_exception(
::pilota::thrift::ProtocolExceptionKind::InvalidData,
"field var_1 is required".to_string(),
"field a is required".to_string(),
),
);
};
let Some(var_2) = var_2 else {
return ::std::result::Result::Err(
::pilota::thrift::new_protocol_exception(
::pilota::thrift::ProtocolExceptionKind::InvalidData,
"field var_2 is required".to_string(),
"field b is required".to_string(),
),
);
};
Expand Down
244 changes: 122 additions & 122 deletions pilota-build/test_data/thrift/apache.rs
View file

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions pilota-build/test_data/thrift/auto_name.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ pub mod auto_name {
let Some(var_1) = var_1 else {
return ::std::result::Result::Err(::pilota::thrift::new_protocol_exception(
::pilota::thrift::ProtocolExceptionKind::InvalidData,
"field var_1 is required".to_string(),
"field id is required".to_string(),
));
};

Expand Down Expand Up @@ -136,7 +136,7 @@ pub mod auto_name {
return ::std::result::Result::Err(
::pilota::thrift::new_protocol_exception(
::pilota::thrift::ProtocolExceptionKind::InvalidData,
"field var_1 is required".to_string(),
"field id is required".to_string(),
),
);
};
Expand Down Expand Up @@ -601,7 +601,7 @@ pub mod auto_name {
let Some(var_1) = var_1 else {
return ::std::result::Result::Err(::pilota::thrift::new_protocol_exception(
::pilota::thrift::ProtocolExceptionKind::InvalidData,
"field var_1 is required".to_string(),
"field req is required".to_string(),
));
};

Expand Down Expand Up @@ -667,7 +667,7 @@ pub mod auto_name {
return ::std::result::Result::Err(
::pilota::thrift::new_protocol_exception(
::pilota::thrift::ProtocolExceptionKind::InvalidData,
"field var_1 is required".to_string(),
"field req is required".to_string(),
),
);
};
Expand Down Expand Up @@ -756,7 +756,7 @@ pub mod auto_name {
let Some(var_1) = var_1 else {
return ::std::result::Result::Err(::pilota::thrift::new_protocol_exception(
::pilota::thrift::ProtocolExceptionKind::InvalidData,
"field var_1 is required".to_string(),
"field req is required".to_string(),
));
};

Expand Down Expand Up @@ -822,7 +822,7 @@ pub mod auto_name {
return ::std::result::Result::Err(
::pilota::thrift::new_protocol_exception(
::pilota::thrift::ProtocolExceptionKind::InvalidData,
"field var_1 is required".to_string(),
"field req is required".to_string(),
),
);
};
Expand Down Expand Up @@ -912,7 +912,7 @@ pub mod auto_name {
let Some(var_1) = var_1 else {
return ::std::result::Result::Err(::pilota::thrift::new_protocol_exception(
::pilota::thrift::ProtocolExceptionKind::InvalidData,
"field var_1 is required".to_string(),
"field req is required".to_string(),
));
};

Expand Down Expand Up @@ -978,7 +978,7 @@ pub mod auto_name {
return ::std::result::Result::Err(
::pilota::thrift::new_protocol_exception(
::pilota::thrift::ProtocolExceptionKind::InvalidData,
"field var_1 is required".to_string(),
"field req is required".to_string(),
),
);
};
Expand Down Expand Up @@ -1209,7 +1209,7 @@ pub mod auto_name {
let Some(var_1) = var_1 else {
return ::std::result::Result::Err(::pilota::thrift::new_protocol_exception(
::pilota::thrift::ProtocolExceptionKind::InvalidData,
"field var_1 is required".to_string(),
"field req is required".to_string(),
));
};

Expand Down Expand Up @@ -1275,7 +1275,7 @@ pub mod auto_name {
return ::std::result::Result::Err(
::pilota::thrift::new_protocol_exception(
::pilota::thrift::ProtocolExceptionKind::InvalidData,
"field var_1 is required".to_string(),
"field req is required".to_string(),
),
);
};
Expand Down Expand Up @@ -1516,13 +1516,13 @@ pub mod auto_name {
let Some(var_1) = var_1 else {
return ::std::result::Result::Err(::pilota::thrift::new_protocol_exception(
::pilota::thrift::ProtocolExceptionKind::InvalidData,
"field var_1 is required".to_string(),
"field ID is required".to_string(),
));
};
let Some(var_2) = var_2 else {
return ::std::result::Result::Err(::pilota::thrift::new_protocol_exception(
::pilota::thrift::ProtocolExceptionKind::InvalidData,
"field var_2 is required".to_string(),
"field Id is required".to_string(),
));
};

Expand Down Expand Up @@ -1596,15 +1596,15 @@ pub mod auto_name {
return ::std::result::Result::Err(
::pilota::thrift::new_protocol_exception(
::pilota::thrift::ProtocolExceptionKind::InvalidData,
"field var_1 is required".to_string(),
"field ID is required".to_string(),
),
);
};
let Some(var_2) = var_2 else {
return ::std::result::Result::Err(
::pilota::thrift::new_protocol_exception(
::pilota::thrift::ProtocolExceptionKind::InvalidData,
"field var_2 is required".to_string(),
"field Id is required".to_string(),
),
);
};
Expand Down
8 changes: 4 additions & 4 deletions pilota-build/test_data/thrift/binary_bytes.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,13 @@ pub mod binary_bytes {
let Some(var_1) = var_1 else {
return ::std::result::Result::Err(::pilota::thrift::new_protocol_exception(
::pilota::thrift::ProtocolExceptionKind::InvalidData,
"field var_1 is required".to_string(),
"field bytes is required".to_string(),
));
};
let Some(var_2) = var_2 else {
return ::std::result::Result::Err(::pilota::thrift::new_protocol_exception(
::pilota::thrift::ProtocolExceptionKind::InvalidData,
"field var_2 is required".to_string(),
"field vec is required".to_string(),
));
};

Expand Down Expand Up @@ -161,15 +161,15 @@ pub mod binary_bytes {
return ::std::result::Result::Err(
::pilota::thrift::new_protocol_exception(
::pilota::thrift::ProtocolExceptionKind::InvalidData,
"field var_1 is required".to_string(),
"field bytes is required".to_string(),
),
);
};
let Some(var_2) = var_2 else {
return ::std::result::Result::Err(
::pilota::thrift::new_protocol_exception(
::pilota::thrift::ProtocolExceptionKind::InvalidData,
"field var_2 is required".to_string(),
"field vec is required".to_string(),
),
);
};
Expand Down
12 changes: 6 additions & 6 deletions pilota-build/test_data/thrift/decode_error.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ pub mod decode_error {
let Some(var_1) = var_1 else {
return ::std::result::Result::Err(::pilota::thrift::new_protocol_exception(
::pilota::thrift::ProtocolExceptionKind::InvalidData,
"field var_1 is required".to_string(),
"field b is required".to_string(),
));
};

Expand Down Expand Up @@ -139,7 +139,7 @@ pub mod decode_error {
return ::std::result::Result::Err(
::pilota::thrift::new_protocol_exception(
::pilota::thrift::ProtocolExceptionKind::InvalidData,
"field var_1 is required".to_string(),
"field b is required".to_string(),
),
);
};
Expand Down Expand Up @@ -228,7 +228,7 @@ pub mod decode_error {
let Some(var_3) = var_3 else {
return ::std::result::Result::Err(::pilota::thrift::new_protocol_exception(
::pilota::thrift::ProtocolExceptionKind::InvalidData,
"field var_3 is required".to_string(),
"field a is required".to_string(),
));
};

Expand Down Expand Up @@ -292,7 +292,7 @@ pub mod decode_error {
return ::std::result::Result::Err(
::pilota::thrift::new_protocol_exception(
::pilota::thrift::ProtocolExceptionKind::InvalidData,
"field var_3 is required".to_string(),
"field a is required".to_string(),
),
);
};
Expand Down Expand Up @@ -381,7 +381,7 @@ pub mod decode_error {
let Some(var_2) = var_2 else {
return ::std::result::Result::Err(::pilota::thrift::new_protocol_exception(
::pilota::thrift::ProtocolExceptionKind::InvalidData,
"field var_2 is required".to_string(),
"field c is required".to_string(),
));
};

Expand Down Expand Up @@ -448,7 +448,7 @@ pub mod decode_error {
return ::std::result::Result::Err(
::pilota::thrift::new_protocol_exception(
::pilota::thrift::ProtocolExceptionKind::InvalidData,
"field var_2 is required".to_string(),
"field c is required".to_string(),
),
);
};
Expand Down
Loading

0 comments on commit d823c9a

Please sign in to comment.