!

Author: Tuntii

crates/cargo-rustapi/src/commands/doctor.rs

@@ -325,9 +325,7 @@ fn build_project_checks(workspace_root: &Path) -> Result<Vec<DoctorCheck>> {
     });
 
     checks.push(
-        if (signals.production_defaults || signals.request_id)
-            && (signals.production_defaults || signals.tracing)
-        {
+        if signals.production_defaults || (signals.request_id && signals.tracing) {
             DoctorCheck::pass(
                 "Request IDs and tracing",
                 "Request ID and tracing signals detected",

crates/cargo-rustapi/src/commands/new.rs

@@ -80,9 +80,9 @@ pub async fn new_project(mut args: NewArgs) -> Result<()> {
             .interact()?;
 
         match selection {
-            1 => Some(ProjectPreset::ProdApi),
-            2 => Some(ProjectPreset::AiApi),
-            3 => Some(ProjectPreset::RealtimeApi),
+            1 => Some(ProjectPreset::Production),
+            2 => Some(ProjectPreset::Ai),
+            3 => Some(ProjectPreset::Realtime),
             _ => None,
         }
     };

crates/cargo-rustapi/src/templates/mod.rs

@@ -26,13 +26,13 @@ pub enum ProjectTemplate {
 pub enum ProjectPreset {
     /// Production-oriented HTTP API defaults.
     #[value(name = "prod-api")]
-    ProdApi,
+    Production,
     /// AI-friendly API defaults with TOON support.
     #[value(name = "ai-api")]
-    AiApi,
+    Ai,
     /// Realtime API defaults with WebSocket support.
     #[value(name = "realtime-api")]
-    RealtimeApi,
+    Realtime,
 }
 
 impl ProjectPreset {
@@ -44,21 +44,21 @@ impl ProjectPreset {
     /// Recommended features that should be enabled for this preset.
     pub fn recommended_features(self) -> Vec<String> {
         match self {
-            ProjectPreset::ProdApi => vec![
+            ProjectPreset::Production => vec![
                 "extras-config",
                 "extras-cors",
                 "extras-rate-limit",
                 "extras-security-headers",
                 "extras-structured-logging",
                 "extras-timeout",
             ],
-            ProjectPreset::AiApi => vec![
+            ProjectPreset::Ai => vec![
                 "extras-config",
                 "extras-structured-logging",
                 "extras-timeout",
                 "protocol-toon",
             ],
-            ProjectPreset::RealtimeApi => vec![
+            ProjectPreset::Realtime => vec![
                 "extras-cors",
                 "extras-structured-logging",
                 "extras-timeout",

crates/rustapi-core/src/app.rs

@@ -1678,6 +1678,138 @@ impl Default for RustApi {
     }
 }
 
+/// Check Basic Auth header against expected credentials
+#[cfg(feature = "swagger-ui")]
+fn check_basic_auth(req: &crate::Request, expected: &str) -> bool {
+    req.headers()
+        .get(http::header::AUTHORIZATION)
+        .and_then(|v| v.to_str().ok())
+        .map(|auth| auth == expected)
+        .unwrap_or(false)
+}
+
+/// Create 401 Unauthorized response with WWW-Authenticate header
+#[cfg(feature = "swagger-ui")]
+fn unauthorized_response() -> crate::Response {
+    http::Response::builder()
+        .status(http::StatusCode::UNAUTHORIZED)
+        .header(
+            http::header::WWW_AUTHENTICATE,
+            "Basic realm=\"API Documentation\"",
+        )
+        .header(http::header::CONTENT_TYPE, "text/plain")
+        .body(crate::response::Body::from("Unauthorized"))
+        .unwrap()
+}
+
+/// Configuration builder for RustAPI with auto-routes
+pub struct RustApiConfig {
+    docs_path: Option<String>,
+    docs_enabled: bool,
+    api_title: String,
+    api_version: String,
+    api_description: Option<String>,
+    body_limit: Option<usize>,
+    layers: LayerStack,
+}
+
+impl Default for RustApiConfig {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl RustApiConfig {
+    pub fn new() -> Self {
+        Self {
+            docs_path: Some("/docs".to_string()),
+            docs_enabled: true,
+            api_title: "RustAPI".to_string(),
+            api_version: "1.0.0".to_string(),
+            api_description: None,
+            body_limit: None,
+            layers: LayerStack::new(),
+        }
+    }
+
+    /// Set the docs path (default: "/docs")
+    pub fn docs_path(mut self, path: impl Into<String>) -> Self {
+        self.docs_path = Some(path.into());
+        self
+    }
+
+    /// Enable or disable docs (default: true)
+    pub fn docs_enabled(mut self, enabled: bool) -> Self {
+        self.docs_enabled = enabled;
+        self
+    }
+
+    /// Set OpenAPI info
+    pub fn openapi_info(
+        mut self,
+        title: impl Into<String>,
+        version: impl Into<String>,
+        description: Option<impl Into<String>>,
+    ) -> Self {
+        self.api_title = title.into();
+        self.api_version = version.into();
+        self.api_description = description.map(|d| d.into());
+        self
+    }
+
+    /// Set body size limit
+    pub fn body_limit(mut self, limit: usize) -> Self {
+        self.body_limit = Some(limit);
+        self
+    }
+
+    /// Add a middleware layer
+    pub fn layer<L>(mut self, layer: L) -> Self
+    where
+        L: MiddlewareLayer,
+    {
+        self.layers.push(Box::new(layer));
+        self
+    }
+
+    /// Build the RustApi instance
+    pub fn build(self) -> RustApi {
+        let mut app = RustApi::new().mount_auto_routes_grouped();
+
+        // Apply configuration
+        if let Some(limit) = self.body_limit {
+            app = app.body_limit(limit);
+        }
+
+        app = app.openapi_info(
+            &self.api_title,
+            &self.api_version,
+            self.api_description.as_deref(),
+        );
+
+        #[cfg(feature = "swagger-ui")]
+        if self.docs_enabled {
+            if let Some(path) = self.docs_path {
+                app = app.docs(&path);
+            }
+        }
+
+        // Apply layers
+        // Note: layers are applied in reverse order in RustApi::layer logic (pushing to vec)
+        app.layers.extend(self.layers);
+
+        app
+    }
+
+    /// Build and run the server
+    pub async fn run(
+        self,
+        addr: impl AsRef<str>,
+    ) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
+        self.build().run(addr.as_ref()).await
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::RustApi;
@@ -2462,134 +2594,3 @@ mod tests {
     }
 }
 
-/// Check Basic Auth header against expected credentials
-#[cfg(feature = "swagger-ui")]
-fn check_basic_auth(req: &crate::Request, expected: &str) -> bool {
-    req.headers()
-        .get(http::header::AUTHORIZATION)
-        .and_then(|v| v.to_str().ok())
-        .map(|auth| auth == expected)
-        .unwrap_or(false)
-}
-
-/// Create 401 Unauthorized response with WWW-Authenticate header
-#[cfg(feature = "swagger-ui")]
-fn unauthorized_response() -> crate::Response {
-    http::Response::builder()
-        .status(http::StatusCode::UNAUTHORIZED)
-        .header(
-            http::header::WWW_AUTHENTICATE,
-            "Basic realm=\"API Documentation\"",
-        )
-        .header(http::header::CONTENT_TYPE, "text/plain")
-        .body(crate::response::Body::from("Unauthorized"))
-        .unwrap()
-}
-
-/// Configuration builder for RustAPI with auto-routes
-pub struct RustApiConfig {
-    docs_path: Option<String>,
-    docs_enabled: bool,
-    api_title: String,
-    api_version: String,
-    api_description: Option<String>,
-    body_limit: Option<usize>,
-    layers: LayerStack,
-}
-
-impl Default for RustApiConfig {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl RustApiConfig {
-    pub fn new() -> Self {
-        Self {
-            docs_path: Some("/docs".to_string()),
-            docs_enabled: true,
-            api_title: "RustAPI".to_string(),
-            api_version: "1.0.0".to_string(),
-            api_description: None,
-            body_limit: None,
-            layers: LayerStack::new(),
-        }
-    }
-
-    /// Set the docs path (default: "/docs")
-    pub fn docs_path(mut self, path: impl Into<String>) -> Self {
-        self.docs_path = Some(path.into());
-        self
-    }
-
-    /// Enable or disable docs (default: true)
-    pub fn docs_enabled(mut self, enabled: bool) -> Self {
-        self.docs_enabled = enabled;
-        self
-    }
-
-    /// Set OpenAPI info
-    pub fn openapi_info(
-        mut self,
-        title: impl Into<String>,
-        version: impl Into<String>,
-        description: Option<impl Into<String>>,
-    ) -> Self {
-        self.api_title = title.into();
-        self.api_version = version.into();
-        self.api_description = description.map(|d| d.into());
-        self
-    }
-
-    /// Set body size limit
-    pub fn body_limit(mut self, limit: usize) -> Self {
-        self.body_limit = Some(limit);
-        self
-    }
-
-    /// Add a middleware layer
-    pub fn layer<L>(mut self, layer: L) -> Self
-    where
-        L: MiddlewareLayer,
-    {
-        self.layers.push(Box::new(layer));
-        self
-    }
-
-    /// Build the RustApi instance
-    pub fn build(self) -> RustApi {
-        let mut app = RustApi::new().mount_auto_routes_grouped();
-
-        // Apply configuration
-        if let Some(limit) = self.body_limit {
-            app = app.body_limit(limit);
-        }
-
-        app = app.openapi_info(
-            &self.api_title,
-            &self.api_version,
-            self.api_description.as_deref(),
-        );
-
-        #[cfg(feature = "swagger-ui")]
-        if self.docs_enabled {
-            if let Some(path) = self.docs_path {
-                app = app.docs(&path);
-            }
-        }
-
-        // Apply layers
-        // Note: layers are applied in reverse order in RustApi::layer logic (pushing to vec)
-        app.layers.extend(self.layers);
-
-        app
-    }
-
-    /// Build and run the server
-    pub async fn run(
-        self,
-        addr: impl AsRef<str>,
-    ) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-        self.build().run(addr.as_ref()).await
-    }
-}

crates/rustapi-core/src/multipart.rs

@@ -814,8 +814,7 @@ mod tests {
     #[test]
     fn test_parse_simple_multipart() {
         let boundary = "----WebKitFormBoundary";
-        let body = format!(
-            "------WebKitFormBoundary\r\n\
+        let body = "------WebKitFormBoundary\r\n\
              Content-Disposition: form-data; name=\"field1\"\r\n\
              \r\n\
              value1\r\n\
@@ -825,7 +824,7 @@ mod tests {
              \r\n\
              file content\r\n\
              ------WebKitFormBoundary--\r\n"
-        );
+            .to_string();
 
         let fields = parse_multipart(&Bytes::from(body), boundary).unwrap();
         assert_eq!(fields.len(), 2);

crates/rustapi-core/src/router.rs

@@ -1677,7 +1677,7 @@ mod property_tests {
         fn prop_empty_or_slashes_normalize_to_root(
             num_slashes in 0..10usize,
         ) {
-            let prefix: String = std::iter::repeat('/').take(num_slashes).collect();
+            let prefix = "/".repeat(num_slashes);
 
             let normalized = normalize_prefix(&prefix);