Reformat code for improved readability and consistency

Tuntii · Tuntii · commit c2fb9d02f17b · 2026-01-03T18:45:45.000+03:00
This commit applies consistent code formatting across several files, including breaking up long lines, aligning parameters, and improving indentation. No functional changes were made; these updates enhance code readability and maintainability.
diff --git a/crates/rustapi-core/src/app.rs b/crates/rustapi-core/src/app.rs
@@ -275,7 +275,11 @@ impl RustApi {
             self = self.route(&path, method_router);
         }
 
-        tracing::info!(paths = path_count, routes = route_count, "Auto-registered routes");
+        tracing::info!(
+            paths = path_count,
+            routes = route_count,
+            "Auto-registered routes"
+        );
 
         // Apply any auto-registered schemas.
         crate::auto_schema::apply_auto_schemas(&mut self.openapi_spec);
diff --git a/crates/rustapi-rs/tests/auto_route.rs b/crates/rustapi-rs/tests/auto_route.rs
@@ -146,7 +146,9 @@ fn test_openapi_includes_query_params() {
         .expect("Query params should be present");
 
     assert!(
-        params.iter().any(|p| p.location == "query" && p.name == "page"),
+        params
+            .iter()
+            .any(|p| p.location == "query" && p.name == "page"),
         "OpenAPI should include query parameter 'page'"
     );
     assert!(
diff --git a/crates/rustapi-toon/src/error.rs b/crates/rustapi-toon/src/error.rs
@@ -35,9 +35,7 @@ impl From<toon_format::ToonError> for ToonError {
 impl From<ToonError> for ApiError {
     fn from(err: ToonError) -> Self {
         match err {
-            ToonError::Encode(msg) => {
-                ApiError::internal(format!("Failed to encode TOON: {}", msg))
-            }
+            ToonError::Encode(msg) => ApiError::internal(format!("Failed to encode TOON: {}", msg)),
             ToonError::Decode(msg) => ApiError::bad_request(format!("Invalid TOON: {}", msg)),
             ToonError::InvalidContentType => ApiError::bad_request(
                 "Invalid content type: expected application/toon or text/toon",
diff --git a/crates/rustapi-toon/src/extractor.rs b/crates/rustapi-toon/src/extractor.rs
@@ -6,7 +6,9 @@ use bytes::Bytes;
 use http::{header, StatusCode};
 use http_body_util::Full;
 use rustapi_core::{ApiError, FromRequest, IntoResponse, Request, Response, Result};
-use rustapi_openapi::{MediaType, Operation, OperationModifier, ResponseModifier, ResponseSpec, SchemaRef};
+use rustapi_openapi::{
+    MediaType, Operation, OperationModifier, ResponseModifier, ResponseSpec, SchemaRef,
+};
 use serde::de::DeserializeOwned;
 use serde::Serialize;
 use std::collections::HashMap;
@@ -90,8 +92,8 @@ impl<T: DeserializeOwned + Send> FromRequest for Toon<T> {
         let body_str =
             std::str::from_utf8(&body).map_err(|e| ApiError::bad_request(e.to_string()))?;
 
-        let value: T = toon_format::decode_default(body_str)
-            .map_err(|e| ToonError::Decode(e.to_string()))?;
+        let value: T =
+            toon_format::decode_default(body_str).map_err(|e| ToonError::Decode(e.to_string()))?;
 
         Ok(Toon(value))
     }
diff --git a/crates/rustapi-toon/src/negotiate.rs b/crates/rustapi-toon/src/negotiate.rs
@@ -8,7 +8,9 @@ use bytes::Bytes;
 use http::{header, StatusCode};
 use http_body_util::Full;
 use rustapi_core::{ApiError, FromRequestParts, IntoResponse, Request, Response};
-use rustapi_openapi::{MediaType, Operation, OperationModifier, ResponseModifier, ResponseSpec, SchemaRef};
+use rustapi_openapi::{
+    MediaType, Operation, OperationModifier, ResponseModifier, ResponseSpec, SchemaRef,
+};
 use serde::Serialize;
 use std::collections::HashMap;
 
@@ -94,12 +96,19 @@ impl AcceptHeader {
                     (part.to_string(), 1.0)
                 };
 
-                Some(MediaTypeEntry { media_type, quality })
+                Some(MediaTypeEntry {
+                    media_type,
+                    quality,
+                })
             })
             .collect();
 
         // Sort by quality (descending)
-        entries.sort_by(|a, b| b.quality.partial_cmp(&a.quality).unwrap_or(std::cmp::Ordering::Equal));
+        entries.sort_by(|a, b| {
+            b.quality
+                .partial_cmp(&a.quality)
+                .unwrap_or(std::cmp::Ordering::Equal)
+        });
 
         // Determine preferred format
         let preferred = Self::determine_format(&entries);
@@ -114,23 +123,23 @@ impl AcceptHeader {
     fn determine_format(entries: &[MediaTypeEntry]) -> OutputFormat {
         for entry in entries {
             let mt = entry.media_type.to_lowercase();
-            
+
             // Check for TOON
             if mt == TOON_CONTENT_TYPE || mt == TOON_CONTENT_TYPE_TEXT {
                 return OutputFormat::Toon;
             }
-            
+
             // Check for JSON
             if mt == JSON_CONTENT_TYPE || mt == "application/json" || mt == "text/json" {
                 return OutputFormat::Json;
             }
-            
+
             // Wildcard accepts anything, default to JSON
             if mt == "*/*" || mt == "application/*" || mt == "text/*" {
                 return OutputFormat::Json;
             }
         }
-        
+
         // Default to JSON
         OutputFormat::Json
     }
@@ -139,7 +148,10 @@ impl AcceptHeader {
     pub fn accepts_toon(&self) -> bool {
         self.media_types.iter().any(|e| {
             let mt = e.media_type.to_lowercase();
-            mt == TOON_CONTENT_TYPE || mt == TOON_CONTENT_TYPE_TEXT || mt == "*/*" || mt == "application/*"
+            mt == TOON_CONTENT_TYPE
+                || mt == TOON_CONTENT_TYPE_TEXT
+                || mt == "*/*"
+                || mt == "application/*"
         })
     }
 
@@ -160,7 +172,7 @@ impl FromRequestParts for AcceptHeader {
             .and_then(|v| v.to_str().ok())
             .map(AcceptHeader::parse)
             .unwrap_or_default();
-        
+
         Ok(accept)
     }
 }
@@ -235,32 +247,28 @@ impl<T> Negotiate<T> {
 impl<T: Serialize> IntoResponse for Negotiate<T> {
     fn into_response(self) -> Response {
         match self.format {
-            OutputFormat::Json => {
-                match serde_json::to_vec(&self.data) {
-                    Ok(body) => http::Response::builder()
-                        .status(StatusCode::OK)
-                        .header(header::CONTENT_TYPE, JSON_CONTENT_TYPE)
-                        .body(Full::new(Bytes::from(body)))
-                        .unwrap(),
-                    Err(err) => {
-                        let error = ApiError::internal(format!("JSON serialization error: {}", err));
-                        error.into_response()
-                    }
+            OutputFormat::Json => match serde_json::to_vec(&self.data) {
+                Ok(body) => http::Response::builder()
+                    .status(StatusCode::OK)
+                    .header(header::CONTENT_TYPE, JSON_CONTENT_TYPE)
+                    .body(Full::new(Bytes::from(body)))
+                    .unwrap(),
+                Err(err) => {
+                    let error = ApiError::internal(format!("JSON serialization error: {}", err));
+                    error.into_response()
                 }
-            }
-            OutputFormat::Toon => {
-                match toon_format::encode_default(&self.data) {
-                    Ok(body) => http::Response::builder()
-                        .status(StatusCode::OK)
-                        .header(header::CONTENT_TYPE, TOON_CONTENT_TYPE)
-                        .body(Full::new(Bytes::from(body)))
-                        .unwrap(),
-                    Err(err) => {
-                        let error = ApiError::internal(format!("TOON serialization error: {}", err));
-                        error.into_response()
-                    }
+            },
+            OutputFormat::Toon => match toon_format::encode_default(&self.data) {
+                Ok(body) => http::Response::builder()
+                    .status(StatusCode::OK)
+                    .header(header::CONTENT_TYPE, TOON_CONTENT_TYPE)
+                    .body(Full::new(Bytes::from(body)))
+                    .unwrap(),
+                Err(err) => {
+                    let error = ApiError::internal(format!("TOON serialization error: {}", err));
+                    error.into_response()
                 }
-            }
+            },
         }
     }
 }
@@ -275,7 +283,7 @@ impl<T: Send> OperationModifier for Negotiate<T> {
 impl<T: Serialize> ResponseModifier for Negotiate<T> {
     fn update_response(op: &mut Operation) {
         let mut content = HashMap::new();
-        
+
         // JSON response
         content.insert(
             JSON_CONTENT_TYPE.to_string(),
@@ -286,7 +294,7 @@ impl<T: Serialize> ResponseModifier for Negotiate<T> {
                 })),
             },
         );
-        
+
         // TOON response
         content.insert(
             TOON_CONTENT_TYPE.to_string(),
@@ -299,7 +307,8 @@ impl<T: Serialize> ResponseModifier for Negotiate<T> {
         );
 
         let response = ResponseSpec {
-            description: "Content-negotiated response (JSON or TOON based on Accept header)".to_string(),
+            description: "Content-negotiated response (JSON or TOON based on Accept header)"
+                .to_string(),
             content: Some(content),
         };
         op.responses.insert("200".to_string(), response);
diff --git a/crates/rustapi-toon/src/openapi.rs b/crates/rustapi-toon/src/openapi.rs
@@ -103,7 +103,7 @@ pub fn token_headers_schema() -> serde_json::Value {
 pub fn format_comparison_example<T: serde::Serialize>(data: &T) -> serde_json::Value {
     let json_str = serde_json::to_string_pretty(data).unwrap_or_default();
     let toon_str = toon_format::encode_default(data).unwrap_or_default();
-    
+
     let json_bytes = json_str.len();
     let toon_bytes = toon_str.len();
     let json_tokens = json_bytes / 4;
@@ -113,7 +113,7 @@ pub fn format_comparison_example<T: serde::Serialize>(data: &T) -> serde_json::V
     } else {
         0.0
     };
-    
+
     serde_json::json!({
         "json": {
             "content": json_str,
@@ -151,26 +151,26 @@ pub fn api_description_with_toon(base_description: &str) -> String {
 mod tests {
     use super::*;
     use serde::Serialize;
-    
+
     #[derive(Serialize)]
     struct TestUser {
         id: u64,
         name: String,
     }
-    
+
     #[test]
     fn test_toon_schema() {
         let schema = toon_schema();
         assert_eq!(schema["type"], "string");
         assert_eq!(schema["format"], "toon");
     }
-    
+
     #[test]
     fn test_toon_extension() {
         let ext = toon_extension();
         assert!(ext["x-toon-support"]["enabled"].as_bool().unwrap());
     }
-    
+
     #[test]
     fn test_token_headers_schema() {
         let headers = token_headers_schema();
@@ -179,21 +179,30 @@ mod tests {
         assert!(headers["X-Token-Savings"].is_object());
         assert!(headers["X-Format-Used"].is_object());
     }
-    
+
     #[test]
     fn test_format_comparison_example() {
         let users = vec![
-            TestUser { id: 1, name: "Alice".to_string() },
-            TestUser { id: 2, name: "Bob".to_string() },
+            TestUser {
+                id: 1,
+                name: "Alice".to_string(),
+            },
+            TestUser {
+                id: 2,
+                name: "Bob".to_string(),
+            },
         ];
         let comparison = format_comparison_example(&users);
-        
+
         assert!(comparison["json"]["bytes"].as_u64().unwrap() > 0);
         assert!(comparison["toon"]["bytes"].as_u64().unwrap() > 0);
         // TOON should be smaller
-        assert!(comparison["toon"]["bytes"].as_u64().unwrap() < comparison["json"]["bytes"].as_u64().unwrap());
+        assert!(
+            comparison["toon"]["bytes"].as_u64().unwrap()
+                < comparison["json"]["bytes"].as_u64().unwrap()
+        );
     }
-    
+
     #[test]
     fn test_api_description_with_toon() {
         let desc = api_description_with_toon("My API");
diff --git a/examples/hello-world/src/main.rs b/examples/hello-world/src/main.rs
@@ -8,10 +8,12 @@ struct Message {
 
 #[rustapi_rs::get("/hello/{name}")]
 async fn hello(Path(name): Path<String>) -> Json<Message> {
-    Json(Message { greeting: format!("Hello, {name}!") })
+    Json(Message {
+        greeting: format!("Hello, {name}!"),
+    })
 }
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
     RustApi::auto().run("0.0.0.0:8080").await
-}
+}
diff --git a/examples/proof-of-concept/src/handlers/mod.rs b/examples/proof-of-concept/src/handlers/mod.rs
@@ -14,8 +14,8 @@ use crate::models::HealthResponse;
 #[rustapi_rs::tag("System")]
 #[rustapi_rs::summary("Frontend")]
 async fn index() -> Html<&'static str> {
-        Html(
-                r#"<!doctype html>
+    Html(
+        r#"<!doctype html>
 <html lang=\"en\">
     <head>
         <meta charset=\"utf-8\" />
@@ -28,7 +28,7 @@ async fn index() -> Html<&'static str> {
         <p>Health: <a href=\"/health\">/health</a></p>
     </body>
 </html>"#,
-        )
+    )
 }
 
 /// Health check endpoint
