Use 'dep' syntax for 'http' features.

rwf2 · Apr 26, 2024 · e6aaea0 · e6aaea0
1 parent 84072a8
commit e6aaea0
Show file tree

Hide file tree

Showing 12 changed files with 46 additions and 49 deletions.
diff --git a/core/http/Cargo.toml b/core/http/Cargo.toml
@@ -17,8 +17,8 @@ rust-version = "1.75"
 
 [features]
 default = []
-serde = ["uncased/with-serde-alloc", "serde_"]
-uuid = ["uuid_"]
+serde = ["dep:serde", "uncased/with-serde-alloc"]
+uuid = ["dep:uuid"]
 
 [lints.clippy]
 module_inception = "allow"
@@ -39,15 +39,13 @@ stable-pattern = "0.1"
 cookie = { version = "0.18", features = ["percent-encode"] }
 state = "0.6"
 
-[dependencies.serde_]
-package = "serde"
+[dependencies.serde]
 version = "1.0"
 optional = true
 default-features = false
 features = ["std"]
 
-[dependencies.uuid_]
-package = "uuid"
+[dependencies.uuid]
 version = "1"
 optional = true
 default-features = false

diff --git a/core/http/src/method.rs b/core/http/src/method.rs
@@ -73,13 +73,12 @@ macro_rules! define_methods {
         /// from either `"GET"` or `"get"` but not `"GeT"`.
         ///
         /// ```rust
-        /// # #[cfg(feature = "serde")] mod serde {
-        /// # use serde_ as serde;
-        /// use serde::{Serialize, Deserialize};
+        /// # #[cfg(feature = "serde")] mod serde_impl {
         /// use rocket::http::Method;
+        /// use rocket::serde::{Serialize, Deserialize};
         ///
         /// #[derive(Deserialize, Serialize)]
-        /// # #[serde(crate = "serde_")]
+        /// #[serde(crate = "rocket::serde")]
         /// struct Foo {
         ///     method: Method,
         /// }
@@ -357,11 +356,11 @@ impl PartialEq<Method> for &Method {
 }
 
 #[cfg(feature = "serde")]
-mod serde {
+mod serde_impl {
     use super::*;
 
-    use serde_::ser::{Serialize, Serializer};
-    use serde_::de::{Deserialize, Deserializer, Error, Visitor, Unexpected};
+    use serde::ser::{Serialize, Serializer};
+    use serde::de::{Deserialize, Deserializer, Error, Visitor, Unexpected};
 
     impl Serialize for Method {
         fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {

diff --git a/core/http/src/raw_str.rs b/core/http/src/raw_str.rs
@@ -901,8 +901,8 @@ impl RawStr {
 }
 
 #[cfg(feature = "serde")]
-mod serde {
-    use serde_::{ser, de, Serialize, Deserialize};
+mod serde_impl {
+    use serde::{ser, de, Serialize, Deserialize};
 
     use super::*;
 

diff --git a/core/http/src/status.rs b/core/http/src/status.rs
@@ -100,13 +100,13 @@ impl StatusClass {
 /// range `[100, 600)` is allowed to deserialize into a `Status`.`
 ///
 /// ```rust
-/// # #[cfg(feature = "serde")] mod serde {
-/// # use serde_ as serde;
+/// # #[cfg(feature = "serde")] mod serde_impl {
+/// # use serde as serde;
 /// use serde::{Serialize, Deserialize};
 /// use rocket::http::Status;
 ///
 /// #[derive(Deserialize, Serialize)]
-/// # #[serde(crate = "serde_")]
+/// # #[serde(crate = "serde")]
 /// struct Foo {
 ///     status: Status,
 /// }
@@ -381,11 +381,11 @@ impl Ord for Status {
 }
 
 #[cfg(feature = "serde")]
-mod serde {
+mod serde_impl {
     use super::*;
 
-    use serde_::ser::{Serialize, Serializer};
-    use serde_::de::{Deserialize, Deserializer, Error, Visitor, Unexpected};
+    use serde::ser::{Serialize, Serializer};
+    use serde::de::{Deserialize, Deserializer, Error, Visitor, Unexpected};
 
     impl Serialize for Status {
         fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {

diff --git a/core/http/src/uri/absolute.rs b/core/http/src/uri/absolute.rs
@@ -72,19 +72,19 @@ use crate::uri::{Authority, Path, Query, Data, Error, as_utf8_unchecked, fmt};
 /// `Absolute` is both `Serialize` and `Deserialize`:
 ///
 /// ```rust
-/// # #[cfg(feature = "serde")] mod serde {
-/// # use serde_ as serde;
+/// # #[cfg(feature = "serde")] mod serde_impl {
+/// # use serde as serde;
 /// use serde::{Serialize, Deserialize};
 /// use rocket::http::uri::Absolute;
 ///
 /// #[derive(Deserialize, Serialize)]
-/// # #[serde(crate = "serde_")]
+/// # #[serde(crate = "serde")]
 /// struct UriOwned {
 ///     uri: Absolute<'static>,
 /// }
 ///
 /// #[derive(Deserialize, Serialize)]
-/// # #[serde(crate = "serde_")]
+/// # #[serde(crate = "serde")]
 /// struct UriBorrowed<'a> {
 ///     uri: Absolute<'a>,
 /// }

diff --git a/core/http/src/uri/asterisk.rs b/core/http/src/uri/asterisk.rs
@@ -8,13 +8,13 @@ use crate::uri::Error;
 /// `Asterisk` is both `Serialize` and `Deserialize`:
 ///
 /// ```rust
-/// # #[cfg(feature = "serde")] mod serde {
-/// # use serde_ as serde;
+/// # #[cfg(feature = "serde")] mod serde_impl {
+/// # use serde as serde;
 /// use serde::{Serialize, Deserialize};
 /// use rocket::http::uri::Asterisk;
 ///
 /// #[derive(Deserialize, Serialize)]
-/// # #[serde(crate = "serde_")]
+/// # #[serde(crate = "serde")]
 /// struct UriOwned {
 ///     uri: Asterisk,
 /// }

diff --git a/core/http/src/uri/authority.rs b/core/http/src/uri/authority.rs
@@ -25,19 +25,19 @@ use crate::uri::{as_utf8_unchecked, error::Error};
 /// `Authority` is both `Serialize` and `Deserialize`:
 ///
 /// ```rust
-/// # #[cfg(feature = "serde")] mod serde {
-/// # use serde_ as serde;
+/// # #[cfg(feature = "serde")] mod serde_impl {
+/// # use serde as serde;
 /// use serde::{Serialize, Deserialize};
 /// use rocket::http::uri::Authority;
 ///
 /// #[derive(Deserialize, Serialize)]
-/// # #[serde(crate = "serde_")]
+/// # #[serde(crate = "serde")]
 /// struct UriOwned {
 ///     uri: Authority<'static>,
 /// }
 ///
 /// #[derive(Deserialize, Serialize)]
-/// # #[serde(crate = "serde_")]
+/// # #[serde(crate = "serde")]
 /// struct UriBorrowed<'a> {
 ///     uri: Authority<'a>,
 /// }

diff --git a/core/http/src/uri/fmt/uri_display.rs b/core/http/src/uri/fmt/uri_display.rs
@@ -505,8 +505,8 @@ impl<K: UriDisplay<Query>, V: UriDisplay<Query>> UriDisplay<Query> for BTreeMap<
     }
 }
 
-#[cfg(feature = "uuid")] impl_with_display!(uuid_::Uuid);
-#[cfg(feature = "uuid")] crate::impl_from_uri_param_identity!(uuid_::Uuid);
+#[cfg(feature = "uuid")] impl_with_display!(uuid::Uuid);
+#[cfg(feature = "uuid")] crate::impl_from_uri_param_identity!(uuid::Uuid);
 
 // And finally, the `Ignorable` trait, which has sugar of `_` in the `uri!`
 // macro, which expands to a typecheck.

diff --git a/core/http/src/uri/host.rs b/core/http/src/uri/host.rs
@@ -69,19 +69,19 @@ use crate::uri::{Absolute, Authority};
 /// `Host` is both `Serialize` and `Deserialize`:
 ///
 /// ```rust
-/// # #[cfg(feature = "serde")] mod serde {
-/// # use serde_ as serde;
+/// # #[cfg(feature = "serde")] mod serde_impl {
+/// # use serde as serde;
 /// use serde::{Serialize, Deserialize};
 /// use rocket::http::uri::Host;
 ///
 /// #[derive(Deserialize, Serialize)]
-/// # #[serde(crate = "serde_")]
+/// # #[serde(crate = "serde")]
 /// struct UriOwned {
 ///     uri: Host<'static>,
 /// }
 ///
 /// #[derive(Deserialize, Serialize)]
-/// # #[serde(crate = "serde_")]
+/// # #[serde(crate = "serde")]
 /// struct UriBorrowed<'a> {
 ///     uri: Host<'a>,
 /// }

diff --git a/core/http/src/uri/origin.rs b/core/http/src/uri/origin.rs
@@ -93,19 +93,19 @@ use crate::{RawStr, RawStrBuf};
 /// `Origin` is both `Serialize` and `Deserialize`:
 ///
 /// ```rust
-/// # #[cfg(feature = "serde")] mod serde {
-/// # use serde_ as serde;
+/// # #[cfg(feature = "serde")] mod serde_impl {
+/// # use serde as serde;
 /// use serde::{Serialize, Deserialize};
 /// use rocket::http::uri::Origin;
 ///
 /// #[derive(Deserialize, Serialize)]
-/// # #[serde(crate = "serde_")]
+/// # #[serde(crate = "serde")]
 /// struct UriOwned {
 ///     uri: Origin<'static>,
 /// }
 ///
 /// #[derive(Deserialize, Serialize)]
-/// # #[serde(crate = "serde_")]
+/// # #[serde(crate = "serde")]
 /// struct UriBorrowed<'a> {
 ///     uri: Origin<'a>,
 /// }

diff --git a/core/http/src/uri/reference.rs b/core/http/src/uri/reference.rs
@@ -51,19 +51,19 @@ use crate::parse::{Extent, IndexedStr};
 /// `Reference` is both `Serialize` and `Deserialize`:
 ///
 /// ```rust
-/// # #[cfg(feature = "serde")] mod serde {
-/// # use serde_ as serde;
+/// # #[cfg(feature = "serde")] mod serde_impl {
+/// # use serde as serde;
 /// use serde::{Serialize, Deserialize};
 /// use rocket::http::uri::Reference;
 ///
 /// #[derive(Deserialize, Serialize)]
-/// # #[serde(crate = "serde_")]
+/// # #[serde(crate = "serde")]
 /// struct UriOwned {
 ///     uri: Reference<'static>,
 /// }
 ///
 /// #[derive(Deserialize, Serialize)]
-/// # #[serde(crate = "serde_")]
+/// # #[serde(crate = "serde")]
 /// struct UriBorrowed<'a> {
 ///     uri: Reference<'a>,
 /// }

diff --git a/core/http/src/uri/uri.rs b/core/http/src/uri/uri.rs
@@ -365,13 +365,13 @@ impl_uri_from!(Asterisk);
 macro_rules! impl_serde {
     ($T:ty, $expected:literal) => {
         #[cfg(feature = "serde")]
-        mod serde {
+        mod serde_impl {
             use std::fmt;
             use std::marker::PhantomData;
             use super::*;
 
-            use serde_::ser::{Serialize, Serializer};
-            use serde_::de::{Deserialize, Deserializer, Error, Visitor};
+            use serde::ser::{Serialize, Serializer};
+            use serde::de::{Deserialize, Deserializer, Error, Visitor};
 
             impl<'a> Serialize for $T {
                 fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {