Skip to content

Commit a3a6381

Browse files
committed
Fix lint
1 parent 8c4ac5d commit a3a6381

6 files changed

Lines changed: 28 additions & 52 deletions

File tree

crates/vespera_macro/src/args.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,11 +180,8 @@ mod tests {
180180
if let syn::Expr::Lit(syn::ExprLit {
181181
lit: syn::Lit::Int(lit_int),
182182
..
183-
}) = elem
184-
{
185-
if let Ok(code) = lit_int.base10_parse::<u16>() {
183+
}) = elem && let Ok(code) = lit_int.base10_parse::<u16>() {
186184
status_codes.push(code);
187-
}
188185
}
189186
}
190187
assert_eq!(

crates/vespera_macro/src/collector.rs

Lines changed: 11 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,6 @@ pub fn get_users() -> String {
118118
}
119119
"#,
120120
)],
121-
1, // expected routes
122-
0, // expected structs
123121
"get",
124122
"/users",
125123
"get_users",
@@ -136,8 +134,6 @@ pub fn create_user() -> String {
136134
}
137135
"#,
138136
)],
139-
1,
140-
0,
141137
"post",
142138
"/create-user",
143139
"create_user",
@@ -154,8 +150,6 @@ pub fn get_users() -> String {
154150
}
155151
"#,
156152
)],
157-
1,
158-
0,
159153
"get",
160154
"/users/api/users",
161155
"get_users",
@@ -172,8 +166,6 @@ pub fn get_users() -> String {
172166
}
173167
"#,
174168
)],
175-
1,
176-
0,
177169
"get",
178170
"/users",
179171
"get_users",
@@ -190,8 +182,6 @@ pub fn get_users() -> String {
190182
}
191183
"#,
192184
)],
193-
1,
194-
0,
195185
"get",
196186
"/api/users",
197187
"get_users",
@@ -208,8 +198,6 @@ pub fn get_users() -> String {
208198
}
209199
"#,
210200
)],
211-
1,
212-
0,
213201
"get",
214202
"/api/v1/users",
215203
"get_users",
@@ -218,8 +206,6 @@ pub fn get_users() -> String {
218206
fn test_collect_metadata_routes(
219207
#[case] folder_name: &str,
220208
#[case] files: Vec<(&str, &str)>,
221-
#[case] expected_routes: usize,
222-
#[case] expected_structs: usize,
223209
#[case] expected_method: &str,
224210
#[case] expected_path: &str,
225211
#[case] expected_function_name: &str,
@@ -233,22 +219,17 @@ pub fn get_users() -> String {
233219

234220
let metadata = collect_metadata(temp_dir.path(), folder_name).unwrap();
235221

236-
assert_eq!(metadata.routes.len(), expected_routes);
237-
assert_eq!(metadata.structs.len(), expected_structs);
238-
239-
if expected_routes > 0 {
240-
let route = &metadata.routes[0];
241-
assert_eq!(route.method, expected_method);
242-
assert_eq!(route.path, expected_path);
243-
assert_eq!(route.function_name, expected_function_name);
244-
assert_eq!(route.module_path, expected_module_path);
245-
if let Some((first_filename, _)) = files.first() {
246-
assert!(
247-
route
248-
.file_path
249-
.contains(first_filename.split('/').next().unwrap())
250-
);
251-
}
222+
let route = &metadata.routes[0];
223+
assert_eq!(route.method, expected_method);
224+
assert_eq!(route.path, expected_path);
225+
assert_eq!(route.function_name, expected_function_name);
226+
assert_eq!(route.module_path, expected_module_path);
227+
if let Some((first_filename, _)) = files.first() {
228+
assert!(
229+
route
230+
.file_path
231+
.contains(first_filename.split('/').next().unwrap())
232+
);
252233
}
253234

254235
drop(temp_dir);

crates/vespera_macro/src/lib.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ mod tests {
435435
let folder_name = "routes";
436436

437437
let result = generate_router_code(
438-
&collect_metadata(&temp_dir.path(), folder_name).unwrap(),
438+
&collect_metadata(temp_dir.path(), folder_name).unwrap(),
439439
None,
440440
None,
441441
);
@@ -592,7 +592,7 @@ pub fn get_users() -> String {
592592
}
593593

594594
let result = generate_router_code(
595-
&collect_metadata(&temp_dir.path(), folder_name).unwrap(),
595+
&collect_metadata(temp_dir.path(), folder_name).unwrap(),
596596
None,
597597
None,
598598
);
@@ -677,7 +677,7 @@ pub fn update_user() -> String {
677677
);
678678

679679
let result = generate_router_code(
680-
&collect_metadata(&temp_dir.path(), folder_name).unwrap(),
680+
&collect_metadata(temp_dir.path(), folder_name).unwrap(),
681681
None,
682682
None,
683683
);
@@ -731,7 +731,7 @@ pub fn create_users() -> String {
731731
);
732732

733733
let result = generate_router_code(
734-
&collect_metadata(&temp_dir.path(), folder_name).unwrap(),
734+
&collect_metadata(temp_dir.path(), folder_name).unwrap(),
735735
None,
736736
None,
737737
);
@@ -777,7 +777,7 @@ pub fn index() -> String {
777777
);
778778

779779
let result = generate_router_code(
780-
&collect_metadata(&temp_dir.path(), folder_name).unwrap(),
780+
&collect_metadata(temp_dir.path(), folder_name).unwrap(),
781781
None,
782782
None,
783783
);
@@ -813,7 +813,7 @@ pub fn get_users() -> String {
813813
);
814814

815815
let result = generate_router_code(
816-
&collect_metadata(&temp_dir.path(), folder_name).unwrap(),
816+
&collect_metadata(temp_dir.path(), folder_name).unwrap(),
817817
None,
818818
None,
819819
);

crates/vespera_macro/src/openapi_generator.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -494,10 +494,8 @@ pub fn create_user() -> String {
494494
assert!(doc.components.as_ref().unwrap().schemas.is_some());
495495
let schemas = doc.components.as_ref().unwrap().schemas.as_ref().unwrap();
496496
assert!(schemas.contains_key("User"));
497-
} else {
498-
if let Some(schemas) = doc.components.as_ref().unwrap().schemas.as_ref() {
499-
assert!(!schemas.contains_key("User"));
500-
}
497+
} else if let Some(schemas) = doc.components.as_ref().unwrap().schemas.as_ref() {
498+
assert!(!schemas.contains_key("User"));
501499
}
502500

503501
// Check route

crates/vespera_macro/src/parser/response.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -377,10 +377,10 @@ mod tests {
377377
assert_eq!(schema.schema_type, Some(SchemaType::Array));
378378
assert!(schema.items.is_some());
379379
// Check that items is String
380-
if let Some(items) = &schema.items {
381-
if let SchemaRef::Inline(items_schema) = items.as_ref() {
382-
assert_eq!(items_schema.schema_type, Some(SchemaType::String));
383-
}
380+
if let Some(items) = &schema.items
381+
&& let SchemaRef::Inline(items_schema) = items.as_ref()
382+
{
383+
assert_eq!(items_schema.schema_type, Some(SchemaType::String));
384384
}
385385
} else {
386386
panic!("Expected inline Array schema");

crates/vespera_macro/src/route/utils.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,10 @@ mod tests {
122122
let file: syn::File = syn::parse_str(&full_code).expect("Failed to parse with attribute");
123123

124124
// Extract the first attribute from the function
125-
if let Some(syn::Item::Fn(fn_item)) = file.items.first() {
126-
if let Some(attr) = fn_item.attrs.first() {
127-
return attr.meta.clone();
128-
}
125+
if let Some(syn::Item::Fn(fn_item)) = file.items.first()
126+
&& let Some(attr) = fn_item.attrs.first()
127+
{
128+
return attr.meta.clone();
129129
}
130130

131131
panic!("Failed to extract meta from attribute: {}", attr_str);

0 commit comments

Comments
 (0)