for rocket master branch (0.6 dev)

aeltorio · aeltorio · commit 42bf7eb09213 · 2025-12-06T14:06:04.000+01:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,12 +19,25 @@ resolver = "2"
 
 [workspace.dependencies]
 log = "0.4"
-rocket = { version = "=0.5.1", default-features = false, features = ["json"] }
-rocket_ws = "0.1.1"
-rocket_http = "=0.5.1"
-rocket_dyn_templates = "=0.2.0"
-rocket_db_pools = "=0.2.0"
-rocket_sync_db_pools = "=0.1.0"
+# Use the development Rocket from the rwf2 fork branch `master` for the workspace
+rocket = { git = "https://github.com/rwf2/Rocket.git", branch = "master", default-features = false, features = [
+    "json",
+    "http2",
+    "http3-preview",
+] }
+rocket_ws = { git = "https://github.com/rwf2/Rocket.git", branch = "master" }
+rocket_http = { git = "https://github.com/rwf2/Rocket.git", branch = "master" }
+rocket_dyn_templates = { git = "https://github.com/rwf2/Rocket.git", branch = "master" }
+rocket_db_pools = { git = "https://github.com/rwf2/Rocket.git", branch = "master" }
+rocket_sync_db_pools = { git = "https://github.com/rwf2/Rocket.git", branch = "master" }
 schemars = "1.1.0"
 serde = "1.0"
 serde_json = "1.0"
+
+[patch.crates-io]
+rocket = { git = "https://github.com/rwf2/Rocket.git", branch = "master" }
+rocket_http = { git = "https://github.com/rwf2/Rocket.git", branch = "master" }
+rocket_ws = { git = "https://github.com/rwf2/Rocket.git", branch = "master" }
+rocket_dyn_templates = { git = "https://github.com/rwf2/Rocket.git", branch = "master" }
+rocket_db_pools = { git = "https://github.com/rwf2/Rocket.git", branch = "master" }
+rocket_sync_db_pools = { git = "https://github.com/rwf2/Rocket.git", branch = "master" }
diff --git a/examples/custom_schema/Cargo.toml b/examples/custom_schema/Cargo.toml
@@ -14,3 +14,4 @@ serde = { workspace = true, features = ["derive"] }
 schemars = "1.1.0"
 
 serde_json = "1.0"
+tracing-subscriber = { version = "0.3", features = ["env-filter", "fmt"] }
diff --git a/examples/custom_schema/src/main.rs b/examples/custom_schema/src/main.rs
@@ -1,4 +1,5 @@
 use rocket::{Build, Rocket};
+use tracing_subscriber::EnvFilter;
 use rocket_okapi::okapi::openapi3::OpenApi;
 use rocket_okapi::settings::UrlObject;
 use rocket_okapi::{mount_endpoints_and_merged_docs, rapidoc::*, swagger_ui::*};
@@ -13,6 +14,10 @@ pub type DataResult<'a, T> =
 
 #[rocket::main]
 async fn main() {
+    // Initialize tracing subscriber so `RUST_LOG` controls the logging output.
+    // Default to `info` if `RUST_LOG` is not set.
+    let env_filter = EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new("info"));
+    tracing_subscriber::fmt().with_env_filter(env_filter).init();
     let launch_result = create_server().launch().await;
     match launch_result {
         Ok(_) => println!("Rocket shut down gracefully."),
diff --git a/examples/dyn_templates/Cargo.toml b/examples/dyn_templates/Cargo.toml
@@ -6,7 +6,6 @@ edition = "2021"
 
 [dependencies]
 rocket = { workspace = true }
-schemars = { workspace = true }
 rocket_okapi = { path = "../../rocket-okapi", features = [
     "swagger",
     "rapidoc",
@@ -15,6 +14,7 @@ rocket_okapi = { path = "../../rocket-okapi", features = [
 serde = { workspace = true, features = ["derive"] }
 rocket_dyn_templates = { workspace = true, features = ["handlebars"] }
 handlebars = "5.0.0"
+tracing-subscriber = { version = "0.3", features = ["env-filter", "fmt"] }
 
 [dev-dependencies]
 serde_json = "1.0"
diff --git a/examples/dyn_templates/src/main.rs b/examples/dyn_templates/src/main.rs
@@ -2,6 +2,7 @@ use rocket::get;
 use rocket_dyn_templates::{context, Template};
 use rocket_okapi::settings::UrlObject;
 use rocket_okapi::{openapi, openapi_get_routes, rapidoc::*, swagger_ui::*};
+use tracing_subscriber::EnvFilter;
 
 /// # Get Page
 ///
@@ -14,6 +15,9 @@ fn get_page(name: String) -> Template {
 
 #[rocket::main]
 async fn main() {
+    // Initialize tracing subscriber so RUST_LOG controls logging
+    let env_filter = EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new("info"));
+    tracing_subscriber::fmt().with_env_filter(env_filter).init();
     let launch_result = rocket::build()
         .mount("/", openapi_get_routes![get_page])
         .mount(
diff --git a/examples/json-web-api/Cargo.toml b/examples/json-web-api/Cargo.toml
@@ -12,6 +12,7 @@ rocket_okapi = { path = "../../rocket-okapi", features = [
 ] }
 serde = { workspace = true, features = ["derive"] }
 schemars = "1.1.0"
+tracing-subscriber = { version = "0.3", features = ["env-filter", "fmt"] }
 
 [dev-dependencies]
 serde_json = "1.0"
diff --git a/examples/json-web-api/src/main.rs b/examples/json-web-api/src/main.rs
@@ -5,6 +5,7 @@ use rocket_okapi::okapi::schemars::JsonSchema;
 use rocket_okapi::settings::UrlObject;
 use rocket_okapi::{openapi, openapi_get_routes, rapidoc::*, swagger_ui::*};
 use serde::{Deserialize, Serialize};
+use tracing_subscriber::EnvFilter;
 
 #[derive(Serialize, Deserialize, JsonSchema)]
 #[serde(rename_all = "camelCase")]
@@ -94,6 +95,9 @@ fn create_post_by_query(post: Post) -> Option<Json<Post>> {
 
 #[rocket::main]
 async fn main() {
+    // Initialize tracing subscriber so RUST_LOG controls logging
+    let env_filter = EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new("info"));
+    tracing_subscriber::fmt().with_env_filter(env_filter).init();
     let launch_result = rocket::build()
         .mount(
             "/",
diff --git a/examples/nested/Cargo.toml b/examples/nested/Cargo.toml
@@ -12,6 +12,7 @@ rocket = { workspace = true }
 rocket_okapi = { path = "../../rocket-okapi", features = ["rapidoc"] }
 serde = { workspace = true, features = ["derive"] }
 serde_json = "1.0"
+tracing-subscriber = { version = "0.3", features = ["env-filter", "fmt"] }
 schemars = "1.1.0"
 
 [dev-dependencies]
diff --git a/examples/nested/src/main.rs b/examples/nested/src/main.rs
@@ -1,4 +1,5 @@
 use rocket::{Build, Rocket};
+use tracing_subscriber::EnvFilter;
 use rocket_okapi::okapi::openapi3::OpenApi;
 use rocket_okapi::settings::UrlObject;
 use rocket_okapi::{mount_endpoints_and_merged_docs, rapidoc::*};
@@ -12,6 +13,9 @@ pub type DataResult<'a, T> =
 
 #[rocket::main]
 async fn main() {
+    // Initialize tracing subscriber so RUST_LOG controls logging
+    let env_filter = EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new("info"));
+    tracing_subscriber::fmt().with_env_filter(env_filter).init();
     let launch_result = create_server().launch().await;
     match launch_result {
         Ok(_) => println!("Rocket shut down gracefully."),
diff --git a/examples/openapi_attributes/Cargo.toml b/examples/openapi_attributes/Cargo.toml
@@ -12,6 +12,7 @@ rocket_okapi = { path = "../../rocket-okapi", features = [
 ] }
 serde = { workspace = true }
 schemars = "1.1.0"
+tracing-subscriber = { version = "0.3", features = ["env-filter", "fmt"] }
 
 [dev-dependencies]
 serde_json = "1.0"
diff --git a/examples/openapi_attributes/src/main.rs b/examples/openapi_attributes/src/main.rs
@@ -3,6 +3,7 @@ use rocket::{get, serde::json::Json};
 use rocket_okapi::okapi::schemars;
 use rocket_okapi::settings::UrlObject;
 use rocket_okapi::{openapi, openapi_get_routes, rapidoc::*, swagger_ui::*};
+use tracing_subscriber::EnvFilter;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
@@ -78,6 +79,9 @@ impl<'r> FromRequest<'r> for CustomDB {
 
 #[rocket::main]
 async fn main() {
+    // Initialize tracing subscriber so RUST_LOG controls logging
+    let env_filter = EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new("info"));
+    tracing_subscriber::fmt().with_env_filter(env_filter).init();
     let launch_result = rocket::build()
         .mount("/", openapi_get_routes![list_users])
         .mount(
diff --git a/examples/raw_identifiers/Cargo.toml b/examples/raw_identifiers/Cargo.toml
@@ -1,19 +1,18 @@
-schemars = "1.1.0"
-
-[dev-dependencies]
-serde_json = "1.0"
 [package]
 name = "raw_identifiers"
 version = "0.1.0"
 authors = ["Alex Payne <apayne@esri.com>"]
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
+schemars = "1.1.0"
 rocket = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 rocket_okapi = { path = "../../rocket-okapi", features = [
     "rapidoc",
     "swagger",
 ] }
+
+[dev-dependencies]
+serde_json = "1.0"
diff --git a/examples/secure_request_guard/Cargo.toml b/examples/secure_request_guard/Cargo.toml
@@ -16,7 +16,8 @@ rocket_okapi = { path = "../../rocket-okapi", features = [
 ] }
 serde = { workspace = true }
 serde_json = { workspace = true }
-tokio = "1.6"
+tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
+tracing-subscriber = { version = "0.3", features = ["env-filter", "fmt"] }
 
 [dev-dependencies]
 serde_json = "1.0"
diff --git a/examples/secure_request_guard/src/main.rs b/examples/secure_request_guard/src/main.rs
@@ -8,6 +8,7 @@ use rocket_okapi::okapi::schemars;
 use rocket_okapi::response::OpenApiResponderInner;
 use rocket_okapi::settings::UrlObject;
 use rocket_okapi::{openapi_get_routes, rapidoc::*, swagger_ui::*, OpenApiError};
+use tracing_subscriber::EnvFilter;
 
 // --------- All different methods of implementing `OpenApiFromRequest` ------------
 // There are a few different ways of doing things.
@@ -36,6 +37,9 @@ mod cookies;
 
 #[tokio::main]
 async fn main() {
+    // Initialize tracing subscriber so RUST_LOG controls logging
+    let env_filter = EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new("info"));
+    tracing_subscriber::fmt().with_env_filter(env_filter).init();
     let figment = Config::figment()
         // Set a dummy secret
         .merge(("secret_key", vec![1u8; 64]));
diff --git a/examples/special-types/Cargo.toml b/examples/special-types/Cargo.toml
@@ -11,6 +11,7 @@ rocket_okapi = { path = "../../rocket-okapi", features = [
     "rapidoc",
 ] }
 serde = { workspace = true, features = ["derive"] }
+tracing-subscriber = { version = "0.3", features = ["env-filter", "fmt"] }
 
 [dev-dependencies]
 serde_json = "1.0"
diff --git a/examples/special-types/src/main.rs b/examples/special-types/src/main.rs
@@ -6,6 +6,7 @@ use rocket_okapi::{openapi, openapi_get_routes, rapidoc::*, swagger_ui::*};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use std::path::PathBuf;
+use tracing_subscriber::EnvFilter;
 
 /// # Get data
 #[openapi(tag = "Users")]
@@ -43,6 +44,9 @@ pub struct ErrorMessage {
 
 #[rocket::main]
 async fn main() {
+    // Initialize tracing subscriber so RUST_LOG controls logging
+    let env_filter = EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new("info"));
+    tracing_subscriber::fmt().with_env_filter(env_filter).init();
     let launch_result = rocket::build()
         .mount("/", openapi_get_routes![get_data, path_info, create_user])
         .mount(
diff --git a/examples/streams/Cargo.toml b/examples/streams/Cargo.toml
@@ -11,6 +11,7 @@ rocket_okapi = { path = "../../rocket-okapi", features = [
     "rapidoc",
 ] }
 serde = { workspace = true, features = ["derive"] }
+tracing-subscriber = { version = "0.3", features = ["env-filter", "fmt"] }
 
 [dev-dependencies]
 serde_json = "1.0"
diff --git a/examples/streams/src/main.rs b/examples/streams/src/main.rs
@@ -12,6 +12,7 @@ use rocket::tokio::fs::File;
 use rocket::tokio::time::{self, Duration};
 use rocket_okapi::settings::UrlObject;
 use rocket_okapi::{openapi, openapi_get_routes, rapidoc::*, swagger_ui::*};
+use tracing_subscriber::EnvFilter;
 
 #[openapi]
 #[get("/event_stream")]
@@ -67,6 +68,9 @@ async fn stream_one() -> std::io::Result<ReaderStream![File]> {
 
 #[rocket::main]
 async fn main() {
+    // Initialize tracing subscriber so RUST_LOG controls logging
+    let env_filter = EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new("info"));
+    tracing_subscriber::fmt().with_env_filter(env_filter).init();
     let launch_result = rocket::build()
         .mount(
             "/",
diff --git a/examples/uuid_usage/Cargo.toml b/examples/uuid_usage/Cargo.toml
@@ -18,6 +18,7 @@ rocket_okapi = { path = "../../rocket-okapi", features = [
 ] }
 serde = { workspace = true, features = ["derive"] }
 uuid = { version = "1.1.1", features = ["v4"] }
+tracing-subscriber = { version = "0.3", features = ["env-filter", "fmt"] }
 
 [dev-dependencies]
 serde_json = "1.0"
diff --git a/examples/uuid_usage/src/main.rs b/examples/uuid_usage/src/main.rs
@@ -1,6 +1,7 @@
 use rocket::{get, post, serde::json::Json, serde::uuid::Uuid};
 use rocket_okapi::settings::UrlObject;
 use rocket_okapi::{openapi, openapi_get_routes, rapidoc::*, swagger_ui::*};
+use tracing_subscriber::EnvFilter;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
@@ -71,6 +72,9 @@ fn create_user(user: Json<User>) -> Json<User> {
 
 #[rocket::main]
 async fn main() {
+    // Initialize tracing subscriber to restore RUST_LOG behavior
+    let env_filter = EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new("info"));
+    tracing_subscriber::fmt().with_env_filter(env_filter).init();
     let launch_result = rocket::build()
         .mount(
             "/",
diff --git a/examples/websocket_usage/Cargo.toml b/examples/websocket_usage/Cargo.toml
@@ -13,6 +13,7 @@ rocket_okapi = { path = "../../rocket-okapi", features = [
     "rocket_ws",
 ] }
 serde = { workspace = true }
+tracing-subscriber = { version = "0.3", features = ["env-filter", "fmt"] }
 
 [dev-dependencies]
 serde_json = "1.0"
diff --git a/examples/websocket_usage/src/main.rs b/examples/websocket_usage/src/main.rs
@@ -3,6 +3,7 @@ use rocket::get;
 use rocket::response::content::RawHtml;
 use rocket_okapi::settings::UrlObject;
 use rocket_okapi::{openapi, openapi_get_routes, rapidoc::*, swagger_ui::*};
+use tracing_subscriber::EnvFilter;
 
 #[openapi]
 #[get("/")]
@@ -71,6 +72,9 @@ fn echo(ws: rocket_ws::WebSocket) -> rocket_ws::Channel<'static> {
 
 #[rocket::main]
 async fn main() {
+    // Initialize tracing subscriber so RUST_LOG controls logging
+    let env_filter = EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new("info"));
+    tracing_subscriber::fmt().with_env_filter(env_filter).init();
     let launch_result = rocket::build()
         .mount("/", openapi_get_routes![test_websocket, hello, echo,])
         .mount(
diff --git a/rocket-okapi-codegen/src/openapi_attr/route_attr.rs b/rocket-okapi-codegen/src/openapi_attr/route_attr.rs
@@ -106,7 +106,7 @@ impl FromMeta for MethodMeta {
     fn from_string(value: &str) -> Result<Self, Error> {
         match Method::from_str(value) {
             Ok(m) => Ok(MethodMeta(m)),
-            Err(()) => {
+            Err(_) => {
                 // Special handling for paths that might be incorrectly parsed as methods
                 // This helps with rust-analyzer false positives for protect_* macros
                 if value.starts_with('/') {
@@ -197,14 +197,14 @@ fn parse_attr(name: &str, args: &[DarlingNestedMeta]) -> Result<Route, Error> {
     if let Some(method_str) = name.strip_prefix("protect_") {
         match Method::from_str(method_str) {
             Ok(method) => parse_method_route_attr(method, args),
-            Err(()) => Err(Error::unsupported_format(&format!(
+            Err(_) => Err(Error::unsupported_format(&format!(
                 "Unknown HTTP method in protect macro: '{method_str}'"
             ))),
         }
     } else {
         match Method::from_str(name) {
             Ok(method) => parse_method_route_attr(method, args),
-            Err(()) => parse_route_attr(args),
+            Err(_) => parse_route_attr(args),
         }
     }
 }
@@ -327,7 +327,7 @@ fn parse_attr_from_attr(attr: &Attribute) -> Result<Route, Error> {
                     data_param: data_param.map(trim_angle_brackers),
                 })
             }
-            Err(()) => Err(Error::unsupported_format(&format!(
+            Err(_) => Err(Error::unsupported_format(&format!(
                 "Unknown HTTP method in protect macro: '{method}'"
             ))),
         }
@@ -352,7 +352,7 @@ fn parse_attr_from_attr(attr: &Attribute) -> Result<Route, Error> {
                     data_param: data_param.map(trim_angle_brackers),
                 })
             }
-            Err(()) => Err(Error::unsupported_format(&format!(
+            Err(_) => Err(Error::unsupported_format(&format!(
                 "Unknown HTTP method: '{name}'"
             ))),
         }
diff --git a/rocket-okapi/Cargo.toml b/rocket-okapi/Cargo.toml
@@ -30,7 +30,7 @@ rocket_sync_db_pools = { workspace = true, optional = true }
 rocket_ws = { workspace = true, optional = true }
 
 [dev-dependencies]
-rocket_sync_db_pools = { version = "0.1.0", features = ["diesel_sqlite_pool"] }
+rocket_sync_db_pools = { workspace = true, features = ["diesel_sqlite_pool"] }
 
 [features]
 default = ["preserve_order"]
diff --git a/rocket-okapi/src/gen.rs b/rocket-okapi/src/gen.rs
@@ -130,6 +130,7 @@ fn set_operation(path_item: &mut PathItem, method: Method, op: Operation) {
         Trace => &mut path_item.trace,
         // Connect not available in OpenAPI3. Maybe should set in extensions?
         Connect => return,
+        _ => return,
     };
     assert!(option.is_none());
     option.replace(op);
diff --git a/rocket-okapi/src/handlers/content.rs b/rocket-okapi/src/handlers/content.rs
diff --git a/rocket-okapi/src/handlers/openapi.rs b/rocket-okapi/src/handlers/openapi.rs
diff --git a/rocket-okapi/src/handlers/redirect.rs b/rocket-okapi/src/handlers/redirect.rs
diff --git a/rocket-okapi/src/response/responder_impls.rs b/rocket-okapi/src/response/responder_impls.rs
diff --git a/rocket-okapi/tests/handlers.rs b/rocket-okapi/tests/handlers.rs
diff --git a/rocket-okapi/tests/responses.rs b/rocket-okapi/tests/responses.rs

Original file line number	Diff line number	Diff line change
`@@ -14,3 +14,4 @@ serde = { workspace = true, features = ["derive"] }`
`14`	`14`	`schemars = "1.1.0"`
`15`	`15`
`16`	`16`	`serde_json = "1.0"`
	`17`	`+tracing-subscriber = { version = "0.3", features = ["env-filter", "fmt"] }`