Move OptionalQuery to axum_extra::query

tokio-rs · Nov 13, 2023 · a10f6dc · a10f6dc
1 parent a8455e9
commit a10f6dc
Show file tree

Hide file tree

Showing 3 changed files with 203 additions and 197 deletions.
diff --git a/axum-extra/src/extract/mod.rs b/axum-extra/src/extract/mod.rs
@@ -10,9 +10,6 @@ mod form;
 #[cfg(feature = "cookie")]
 pub mod cookie;
 
-#[cfg(feature = "query")]
-mod optional_query;
-
 #[cfg(feature = "query")]
 mod query;
 
@@ -34,10 +31,7 @@ pub use self::cookie::SignedCookieJar;
 pub use self::form::{Form, FormRejection};
 
 #[cfg(feature = "query")]
-pub use self::optional_query::{OptionalQuery, OptionalQueryRejection};
-
-#[cfg(feature = "query")]
-pub use self::query::{Query, QueryRejection};
+pub use self::query::{OptionalQuery, OptionalQueryRejection, Query, QueryRejection};
 
 #[cfg(feature = "multipart")]
 pub use self::multipart::Multipart;

diff --git a/axum-extra/src/extract/optional_query.rs b/axum-extra/src/extract/optional_query.rs