Skip to content

Commit 59c0bd0

Browse files
committed
Fix fmt issue
1 parent ed993d5 commit 59c0bd0

6 files changed

Lines changed: 13 additions & 72 deletions

File tree

crates/vespera_macro/rustfmt.toml

Lines changed: 0 additions & 3 deletions
This file was deleted.

crates/vespera_macro/src/collector.rs

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,7 @@ use crate::{
1515
pub fn collect_metadata(folder_path: &Path, folder_name: &str) -> MacroResult<CollectedMetadata> {
1616
let mut metadata = CollectedMetadata::new();
1717

18-
let files = collect_files(folder_path).map_err(|e| {
19-
err_call_site(format!(
20-
"vespera! macro: failed to scan route folder '{}': {}. Verify the folder exists and is readable.",
21-
folder_path.display(),
22-
e
23-
))
24-
})?;
18+
let files = collect_files(folder_path).map_err(|e| err_call_site(format!("vespera! macro: failed to scan route folder '{}': {}. Verify the folder exists and is readable.", folder_path.display(), e)))?;
2519

2620
for file in files {
2721
if !file.extension().map(|e| e == "rs").unwrap_or(false) {
@@ -36,13 +30,7 @@ pub fn collect_metadata(folder_path: &Path, folder_name: &str) -> MacroResult<Co
3630
))
3731
})?;
3832

39-
let file_ast = syn::parse_file(&content).map_err(|e| {
40-
err_call_site(format!(
41-
"vespera! macro: syntax error in '{}': {}. Fix the Rust syntax errors in this file.",
42-
file.display(),
43-
e
44-
))
45-
})?;
33+
let file_ast = syn::parse_file(&content).map_err(|e| err_call_site(format!("vespera! macro: syntax error in '{}': {}. Fix the Rust syntax errors in this file.", file.display(), e)))?;
4634

4735
// Get module path
4836
let segments = file

crates/vespera_macro/src/route_impl.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,7 @@ pub(crate) fn process_route_attribute(
5757
item: proc_macro2::TokenStream,
5858
) -> syn::Result<proc_macro2::TokenStream> {
5959
syn::parse2::<args::RouteArgs>(attr)?;
60-
let item_fn: syn::ItemFn = syn::parse2(item.clone()).map_err(|e| {
61-
syn::Error::new(e.span(), "#[route] attribute: can only be applied to functions, not other items. Move or remove the attribute.")
62-
})?;
60+
let item_fn: syn::ItemFn = syn::parse2(item.clone()).map_err(|e| syn::Error::new(e.span(), "#[route] attribute: can only be applied to functions, not other items. Move or remove the attribute."))?;
6361
validate_route_fn(&item_fn)?;
6462
Ok(item)
6563
}

crates/vespera_macro/src/router_codegen.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -342,12 +342,7 @@ fn parse_server_struct(input: ParseStream) -> syn::Result<ServerConfig> {
342342
}
343343
}
344344

345-
let url = url.ok_or_else(|| {
346-
syn::Error::new(
347-
proc_macro2::Span::call_site(),
348-
"vespera! macro: server configuration missing required `url` field. Use format: `servers = { url = \"http://localhost:3000\" }` or `servers = { url = \"...\", description = \"...\" }`.",
349-
)
350-
})?;
345+
let url = url.ok_or_else(|| syn::Error::new(proc_macro2::Span::call_site(), "vespera! macro: server configuration missing required `url` field. Use format: `servers = { url = \"http://localhost:3000\" }` or `servers = { url = \"...\", description = \"...\" }`."))?;
351346

352347
Ok(ServerConfig { url, description })
353348
}

crates/vespera_macro/src/schema_macro/type_utils.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,7 @@ pub fn extract_type_name(ty: &Type) -> Result<String, syn::Error> {
1212
match ty {
1313
Type::Path(type_path) => {
1414
// Get the last segment (handles paths like crate::User)
15-
let segment = type_path.path.segments.last().ok_or_else(|| {
16-
syn::Error::new_spanned(
17-
ty,
18-
"extract_type_name: type path has no segments. Provide a valid type like `User` or `crate::models::User`.",
19-
)
20-
})?;
15+
let segment = type_path.path.segments.last().ok_or_else(|| syn::Error::new_spanned(ty, "extract_type_name: type path has no segments. Provide a valid type like `User` or `crate::models::User`."))?;
2116
Ok(segment.ident.to_string())
2217
}
2318
_ => Err(syn::Error::new_spanned(

crates/vespera_macro/src/vespera_impl.rs

Lines changed: 8 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -82,21 +82,14 @@ pub(crate) fn generate_and_write_openapi(
8282
}
8383
}
8484

85-
let json_str = serde_json::to_string_pretty(&openapi_doc)
86-
.map_err(|e| err_call_site(format!("OpenAPI generation: failed to serialize document to JSON. Error: {}. Check that all schema types are serializable.", e)))?;
85+
let json_str = serde_json::to_string_pretty(&openapi_doc).map_err(|e| err_call_site(format!("OpenAPI generation: failed to serialize document to JSON. Error: {}. Check that all schema types are serializable.", e)))?;
8786

8887
for openapi_file_name in &input.openapi_file_names {
8988
let file_path = Path::new(openapi_file_name);
9089
if let Some(parent) = file_path.parent() {
91-
std::fs::create_dir_all(parent)
92-
.map_err(|e| err_call_site(format!("OpenAPI output: failed to create directory '{}'. Error: {}. Ensure the path is valid and writable.", parent.display(), e)))?;
90+
std::fs::create_dir_all(parent).map_err(|e| err_call_site(format!("OpenAPI output: failed to create directory '{}'. Error: {}. Ensure the path is valid and writable.", parent.display(), e)))?;
9391
}
94-
std::fs::write(file_path, &json_str).map_err(|e| {
95-
err_call_site(format!(
96-
"OpenAPI output: failed to write file '{}'. Error: {}. Ensure the file path is writable.",
97-
openapi_file_name, e
98-
))
99-
})?;
92+
std::fs::write(file_path, &json_str).map_err(|e| err_call_site(format!("OpenAPI output: failed to write file '{}'. Error: {}. Ensure the file path is writable.", openapi_file_name, e)))?;
10093
}
10194

10295
let docs_info = input
@@ -170,12 +163,7 @@ pub(crate) fn process_vespera_macro(
170163
));
171164
}
172165

173-
let mut metadata = collect_metadata(&folder_path, &processed.folder_name).map_err(|e| {
174-
syn::Error::new(
175-
Span::call_site(),
176-
format!("vespera! macro: failed to scan route folder '{}'. Error: {}. Check that all .rs files have valid Rust syntax.", processed.folder_name, e),
177-
)
178-
})?;
166+
let mut metadata = collect_metadata(&folder_path, &processed.folder_name).map_err(|e| syn::Error::new(Span::call_site(), format!("vespera! macro: failed to scan route folder '{}'. Error: {}. Check that all .rs files have valid Rust syntax.", processed.folder_name, e)))?;
179167
metadata.structs.extend(schema_storage.iter().cloned());
180168

181169
let (docs_info, redoc_info) = generate_and_write_openapi(processed, &metadata)?;
@@ -206,41 +194,21 @@ pub(crate) fn process_export_app(
206194
));
207195
}
208196

209-
let mut metadata = collect_metadata(&folder_path, folder_name).map_err(|e| {
210-
syn::Error::new(
211-
Span::call_site(),
212-
format!("export_app! macro: failed to scan route folder '{}'. Error: {}. Check that all .rs files have valid Rust syntax.", folder_name, e),
213-
)
214-
})?;
197+
let mut metadata = collect_metadata(&folder_path, folder_name).map_err(|e| syn::Error::new(Span::call_site(), format!("export_app! macro: failed to scan route folder '{}'. Error: {}. Check that all .rs files have valid Rust syntax.", folder_name, e)))?;
215198
metadata.structs.extend(schema_storage.iter().cloned());
216199

217200
// Generate OpenAPI spec JSON string
218201
let openapi_doc = generate_openapi_doc_with_metadata(None, None, None, &metadata);
219-
let spec_json = serde_json::to_string(&openapi_doc).map_err(|e| {
220-
syn::Error::new(
221-
Span::call_site(),
222-
format!("export_app! macro: failed to serialize OpenAPI spec to JSON. Error: {}. Check that all schema types are serializable.", e),
223-
)
224-
})?;
202+
let spec_json = serde_json::to_string(&openapi_doc).map_err(|e| syn::Error::new(Span::call_site(), format!("export_app! macro: failed to serialize OpenAPI spec to JSON. Error: {}. Check that all schema types are serializable.", e)))?;
225203

226204
// Write spec to temp file for compile-time merging by parent apps
227205
let name_str = name.to_string();
228206
let manifest_path = Path::new(manifest_dir);
229207
let target_dir = find_target_dir(manifest_path);
230208
let vespera_dir = target_dir.join("vespera");
231-
std::fs::create_dir_all(&vespera_dir).map_err(|e| {
232-
syn::Error::new(
233-
Span::call_site(),
234-
format!("export_app! macro: failed to create build cache directory '{}'. Error: {}. Ensure the target directory is writable.", vespera_dir.display(), e),
235-
)
236-
})?;
209+
std::fs::create_dir_all(&vespera_dir).map_err(|e| syn::Error::new(Span::call_site(), format!("export_app! macro: failed to create build cache directory '{}'. Error: {}. Ensure the target directory is writable.", vespera_dir.display(), e)))?;
237210
let spec_file = vespera_dir.join(format!("{}.openapi.json", name_str));
238-
std::fs::write(&spec_file, &spec_json).map_err(|e| {
239-
syn::Error::new(
240-
Span::call_site(),
241-
format!("export_app! macro: failed to write OpenAPI spec file '{}'. Error: {}. Ensure the file path is writable.", spec_file.display(), e),
242-
)
243-
})?;
211+
std::fs::write(&spec_file, &spec_json).map_err(|e| syn::Error::new(Span::call_site(), format!("export_app! macro: failed to write OpenAPI spec file '{}'. Error: {}. Ensure the file path is writable.", spec_file.display(), e)))?;
244212

245213
// Generate router code (without docs routes, no merge)
246214
let router_code = generate_router_code(&metadata, None, None, &[]);

0 commit comments

Comments
 (0)