Skip to content

Commit c1ae18b

Browse files
owjs3901owjs3901
committed
refactor: fix clippy pedantic warnings in test code for --all-targets compliance
1 parent 6544ec8 commit c1ae18b

7 files changed

Lines changed: 76 additions & 83 deletions

File tree

‎crates/vespera_macro/src/parser/operation.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ mod tests {
270270
schema: Option<SchemaType>,
271271
}
272272

273-
fn assert_body(op: &Operation, expected: &Option<ExpectedBody>) {
273+
fn assert_body(op: &Operation, expected: Option<&ExpectedBody>) {
274274
match expected {
275275
None => assert!(op.request_body.is_none()),
276276
Some(exp) => {
@@ -488,7 +488,7 @@ mod tests {
488488
) {
489489
let op = build(sig_src, path, extra_status);
490490
assert_params(&op, &expected_params);
491-
assert_body(&op, &expected_body);
491+
assert_body(&op, expected_body.as_ref());
492492
assert_responses(&op, &expected_resps);
493493
}
494494

@@ -564,7 +564,7 @@ mod tests {
564564
SchemaRef::Inline(schema) => {
565565
assert_eq!(schema.schema_type, Some(SchemaType::String));
566566
}
567-
_ => panic!("expected inline schema"),
567+
SchemaRef::Ref(_) => panic!("expected inline schema"),
568568
}
569569
}
570570

‎crates/vespera_macro/src/parser/parameters.rs‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -433,6 +433,7 @@ mod tests {
433433
use insta::{assert_debug_snapshot, with_settings};
434434
use rstest::rstest;
435435
use vespera_core::route::ParameterLocation;
436+
use vespera_core::schema::Reference;
436437

437438
use super::*;
438439

@@ -1095,15 +1096,15 @@ mod tests {
10951096

10961097
// Tests for convert_to_inline_schema helper function
10971098
#[test]
1098-
fn test_convert_to_inline_schema_inline_required() {
1099+
fn test_convert_to_inline_schema_inline() {
10991100
let schema = SchemaRef::Inline(Box::new(Schema::string()));
11001101
let result = convert_to_inline_schema(schema, false);
11011102
match result {
11021103
SchemaRef::Inline(s) => {
11031104
assert_eq!(s.schema_type, Some(SchemaType::String));
11041105
assert!(s.nullable.is_none());
11051106
}
1106-
_ => panic!("Expected Inline"),
1107+
SchemaRef::Ref(_) => panic!("Expected Inline"),
11071108
}
11081109
}
11091110

@@ -1116,21 +1117,21 @@ mod tests {
11161117
assert_eq!(s.schema_type, Some(SchemaType::String));
11171118
assert_eq!(s.nullable, Some(true));
11181119
}
1119-
_ => panic!("Expected Inline"),
1120+
SchemaRef::Ref(_) => panic!("Expected Inline"),
11201121
}
11211122
}
11221123

11231124
#[test]
1124-
fn test_convert_to_inline_schema_ref_required() {
1125-
use vespera_core::schema::Reference;
1126-
let schema = SchemaRef::Ref(Reference::schema("SomeType"));
1127-
let result = convert_to_inline_schema(schema, false);
1125+
fn test_convert_to_inline_schema_with_ref_optional() {
1126+
let schema = SchemaRef::Ref(Reference {
1127+
ref_path: "#/components/schemas/User".to_string(),
1128+
});
1129+
let result = convert_to_inline_schema(schema, true);
11281130
match result {
11291131
SchemaRef::Inline(s) => {
1130-
assert_eq!(s.schema_type, Some(SchemaType::Object));
1131-
assert!(s.nullable.is_none());
1132+
assert_eq!(s.nullable, Some(true));
11321133
}
1133-
_ => panic!("Expected Inline"),
1134+
SchemaRef::Ref(_) => panic!("Expected Inline"),
11341135
}
11351136
}
11361137

@@ -1144,7 +1145,7 @@ mod tests {
11441145
assert_eq!(s.schema_type, Some(SchemaType::Object));
11451146
assert_eq!(s.nullable, Some(true));
11461147
}
1147-
_ => panic!("Expected Inline"),
1148+
SchemaRef::Ref(_) => panic!("Expected Inline"),
11481149
}
11491150
}
11501151
}

‎crates/vespera_macro/src/parser/schema/enum_schema.rs‎

Lines changed: 37 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ use vespera_core::schema::{Discriminator, Schema, SchemaRef, SchemaType};
2121

2222
use super::{
2323
serde_attrs::{
24-
SerdeEnumRepr, extract_doc_comment, extract_enum_repr, extract_field_rename,
25-
extract_rename_all, rename_field, strip_raw_prefix,
24+
extract_doc_comment, extract_enum_repr, extract_field_rename, extract_rename_all,
25+
rename_field, strip_raw_prefix, SerdeEnumRepr,
2626
},
2727
type_schema::parse_type_to_schema_ref,
2828
};
@@ -775,13 +775,11 @@ mod tests {
775775
let inner_props = inner_obj.properties.as_ref().unwrap();
776776
assert!(inner_props.contains_key("id"));
777777
assert!(inner_props.contains_key("note"));
778-
assert!(
779-
inner_obj
780-
.required
781-
.as_ref()
782-
.unwrap()
783-
.contains(&"id".to_string())
784-
);
778+
assert!(inner_obj
779+
.required
780+
.as_ref()
781+
.unwrap()
782+
.contains(&"id".to_string()));
785783
} else {
786784
panic!("Expected inline object schema");
787785
}
@@ -822,9 +820,8 @@ mod tests {
822820
let one_of = schema.one_of.expect("one_of missing for mixed enum");
823821
assert_eq!(one_of.len(), expected_one_of_len);
824822

825-
let unit_schema = match &one_of[0] {
826-
SchemaRef::Inline(s) => s,
827-
_ => panic!("Expected inline schema for unit variant"),
823+
let SchemaRef::Inline(unit_schema) = &one_of[0] else {
824+
panic!("Expected inline schema for unit variant")
828825
};
829826
assert_eq!(unit_schema.schema_type, Some(expected_unit_type));
830827
let unit_enum = unit_schema.r#enum.as_ref().expect("enum values missing");
@@ -845,9 +842,8 @@ mod tests {
845842

846843
let schema = parse_enum_to_schema(&enum_item, &HashSet::new(), &HashMap::new());
847844
let one_of = schema.one_of.expect("one_of missing");
848-
let variant_obj = match &one_of[0] {
849-
SchemaRef::Inline(s) => s,
850-
_ => panic!("Expected inline schema"),
845+
let SchemaRef::Inline(variant_obj) = &one_of[0] else {
846+
panic!("Expected inline schema")
851847
};
852848
let props = variant_obj
853849
.properties
@@ -870,17 +866,15 @@ mod tests {
870866

871867
let schema = parse_enum_to_schema(&enum_item, &HashSet::new(), &HashMap::new());
872868
let one_of = schema.one_of.expect("one_of missing");
873-
let variant_obj = match &one_of[0] {
874-
SchemaRef::Inline(s) => s,
875-
_ => panic!("Expected inline schema"),
869+
let SchemaRef::Inline(variant_obj) = &one_of[0] else {
870+
panic!("Expected inline schema")
876871
};
877872
let props = variant_obj
878873
.properties
879874
.as_ref()
880875
.expect("variant props missing");
881-
let inner = match props.get("detail").expect("variant key missing") {
882-
SchemaRef::Inline(s) => s,
883-
_ => panic!("Expected inline inner schema"),
876+
let SchemaRef::Inline(inner) = props.get("detail").expect("variant key missing") else {
877+
panic!("Expected inline inner schema")
884878
};
885879
let inner_props = inner.properties.as_ref().expect("inner props missing");
886880
assert!(inner_props.contains_key("user_id"));
@@ -902,9 +896,8 @@ mod tests {
902896

903897
let schema = parse_enum_to_schema(&enum_item, &HashSet::new(), &HashMap::new());
904898
let one_of = schema.one_of.expect("one_of missing");
905-
let variant_obj = match &one_of[0] {
906-
SchemaRef::Inline(s) => s,
907-
_ => panic!("Expected inline schema"),
899+
let SchemaRef::Inline(variant_obj) = &one_of[0] else {
900+
panic!("Expected inline schema")
908901
};
909902
let props = variant_obj
910903
.properties
@@ -929,21 +922,19 @@ mod tests {
929922

930923
let schema = parse_enum_to_schema(&enum_item, &HashSet::new(), &HashMap::new());
931924
let one_of = schema.one_of.expect("one_of missing");
932-
let variant_obj = match &one_of[0] {
933-
SchemaRef::Inline(s) => s,
934-
_ => panic!("Expected inline schema"),
925+
let SchemaRef::Inline(variant_obj) = &one_of[0] else {
926+
panic!("Expected inline schema")
935927
};
936928
let props = variant_obj
937929
.properties
938930
.as_ref()
939931
.expect("variant props missing");
940-
let inner = match props
932+
let SchemaRef::Inline(inner) = props
941933
.get("detail")
942934
.or_else(|| props.get("Detail"))
943935
.expect("variant key missing")
944-
{
945-
SchemaRef::Inline(s) => s,
946-
_ => panic!("Expected inline inner schema"),
936+
else {
937+
panic!("Expected inline inner schema")
947938
};
948939
let inner_props = inner.properties.as_ref().expect("inner props missing");
949940
assert!(inner_props.contains_key("ID")); // field-level rename wins
@@ -988,9 +979,8 @@ mod tests {
988979
let one_of = schema.one_of.expect("one_of missing");
989980

990981
// Check UserCreated variant key is camelCase
991-
let variant_obj = match &one_of[0] {
992-
SchemaRef::Inline(s) => s,
993-
_ => panic!("Expected inline schema"),
982+
let SchemaRef::Inline(variant_obj) = &one_of[0] else {
983+
panic!("Expected inline schema")
994984
};
995985
let props = variant_obj
996986
.properties
@@ -1001,9 +991,8 @@ mod tests {
1001991
assert!(!props.contains_key("user_created"));
1002992

1003993
// Check UserDeleted variant key is camelCase
1004-
let variant_obj2 = match &one_of[1] {
1005-
SchemaRef::Inline(s) => s,
1006-
_ => panic!("Expected inline schema"),
994+
let SchemaRef::Inline(variant_obj2) = &one_of[1] else {
995+
panic!("Expected inline schema")
1007996
};
1008997
let props2 = variant_obj2
1009998
.properties
@@ -1153,17 +1142,15 @@ mod tests {
11531142
let one_of = schema.one_of.expect("one_of missing");
11541143

11551144
// Get the Data variant schema
1156-
let variant_obj = match &one_of[0] {
1157-
SchemaRef::Inline(s) => s,
1158-
_ => panic!("Expected inline schema"),
1145+
let SchemaRef::Inline(variant_obj) = &one_of[0] else {
1146+
panic!("Expected inline schema")
11591147
};
11601148
let props = variant_obj
11611149
.properties
11621150
.as_ref()
11631151
.expect("variant props missing");
1164-
let inner = match props.get("Data").expect("variant key missing") {
1165-
SchemaRef::Inline(s) => s,
1166-
_ => panic!("Expected inline inner schema"),
1152+
let SchemaRef::Inline(inner) = props.get("Data").expect("variant key missing") else {
1153+
panic!("Expected inline inner schema")
11671154
};
11681155
let inner_props = inner.properties.as_ref().expect("inner props missing");
11691156

@@ -1179,12 +1166,10 @@ mod tests {
11791166
// Should have allOf with the original $ref
11801167
let all_of = schema.all_of.as_ref().expect("allOf missing");
11811168
assert_eq!(all_of.len(), 1);
1182-
match &all_of[0] {
1183-
SchemaRef::Ref(reference) => {
1184-
assert_eq!(reference.ref_path, "#/components/schemas/User");
1185-
}
1186-
_ => panic!("Expected $ref in allOf"),
1187-
}
1169+
let SchemaRef::Ref(reference) = &all_of[0] else {
1170+
panic!("Expected $ref in allOf")
1171+
};
1172+
assert_eq!(reference.ref_path, "#/components/schemas/User");
11881173
}
11891174
SchemaRef::Ref(_) => panic!("Expected inline schema with allOf, not direct $ref"),
11901175
}
@@ -1589,9 +1574,9 @@ mod tests {
15891574
.properties
15901575
.as_ref()
15911576
.expect("variant props missing");
1592-
let inner = match props.get("Empty").expect("Empty key missing") {
1593-
SchemaRef::Inline(s) => s,
1594-
_ => panic!("Expected inline schema"),
1577+
let SchemaRef::Inline(inner) = props.get("Empty").expect("Empty key missing")
1578+
else {
1579+
panic!("Expected inline schema")
15951580
};
15961581
// Empty struct should have properties: None and required: None
15971582
assert!(inner.properties.is_none());

‎crates/vespera_macro/src/parser/schema/serde_attrs.rs‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -729,6 +729,8 @@ pub fn extract_untagged(attrs: &[syn::Attribute]) -> bool {
729729

730730
#[cfg(test)]
731731
mod tests {
732+
#![allow(clippy::option_option)]
733+
732734
use rstest::rstest;
733735

734736
use super::*;
@@ -974,7 +976,12 @@ mod tests {
974976
r#"#[serde(skip_serializing_if = "Option::is_none", default = "my_default")] field: i32"#,
975977
Some(Some("my_default"))
976978
)]
977-
fn test_extract_default(#[case] field_src: &str, #[case] expected: Option<Option<&str>>) {
979+
fn test_extract_default(
980+
#[case] field_src: &str,
981+
#[case]
982+
#[allow(clippy::option_option)]
983+
expected: Option<Option<&str>>,
984+
) {
978985
let struct_src = format!("struct Foo {{ {field_src} }}");
979986
let item: syn::ItemStruct = syn::parse_str(&struct_src).unwrap();
980987
if let syn::Fields::Named(fields) = &item.fields {

0 commit comments

Comments
 (0)