Skip to content

Commit e6aaea0

Browse files
SergioBenitezSergioBenitez
committed
Use 'dep' syntax for 'http' features.
1 parent 84072a8 commit e6aaea0

12 files changed

+46
-49
lines changed

‎core/http/Cargo.toml

+4-6
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ rust-version = "1.75"
1717

1818
[features]
1919
default = []
20-
serde = ["uncased/with-serde-alloc", "serde_"]
21-
uuid = ["uuid_"]
20+
serde = ["dep:serde", "uncased/with-serde-alloc"]
21+
uuid = ["dep:uuid"]
2222

2323
[lints.clippy]
2424
module_inception = "allow"
@@ -39,15 +39,13 @@ stable-pattern = "0.1"
3939
cookie = { version = "0.18", features = ["percent-encode"] }
4040
state = "0.6"
4141

42-
[dependencies.serde_]
43-
package = "serde"
42+
[dependencies.serde]
4443
version = "1.0"
4544
optional = true
4645
default-features = false
4746
features = ["std"]
4847

49-
[dependencies.uuid_]
50-
package = "uuid"
48+
[dependencies.uuid]
5149
version = "1"
5250
optional = true
5351
default-features = false

‎core/http/src/method.rs

+6-7
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,12 @@ macro_rules! define_methods {
7373
/// from either `"GET"` or `"get"` but not `"GeT"`.
7474
///
7575
/// ```rust
76-
/// # #[cfg(feature = "serde")] mod serde {
77-
/// # use serde_ as serde;
78-
/// use serde::{Serialize, Deserialize};
76+
/// # #[cfg(feature = "serde")] mod serde_impl {
7977
/// use rocket::http::Method;
78+
/// use rocket::serde::{Serialize, Deserialize};
8079
///
8180
/// #[derive(Deserialize, Serialize)]
82-
/// # #[serde(crate = "serde_")]
81+
/// #[serde(crate = "rocket::serde")]
8382
/// struct Foo {
8483
/// method: Method,
8584
/// }
@@ -357,11 +356,11 @@ impl PartialEq<Method> for &Method {
357356
}
358357

359358
#[cfg(feature = "serde")]
360-
mod serde {
359+
mod serde_impl {
361360
use super::*;
362361

363-
use serde_::ser::{Serialize, Serializer};
364-
use serde_::de::{Deserialize, Deserializer, Error, Visitor, Unexpected};
362+
use serde::ser::{Serialize, Serializer};
363+
use serde::de::{Deserialize, Deserializer, Error, Visitor, Unexpected};
365364

366365
impl Serialize for Method {
367366
fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {

‎core/http/src/raw_str.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -901,8 +901,8 @@ impl RawStr {
901901
}
902902

903903
#[cfg(feature = "serde")]
904-
mod serde {
905-
use serde_::{ser, de, Serialize, Deserialize};
904+
mod serde_impl {
905+
use serde::{ser, de, Serialize, Deserialize};
906906

907907
use super::*;
908908

‎core/http/src/status.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,13 @@ impl StatusClass {
100100
/// range `[100, 600)` is allowed to deserialize into a `Status`.`
101101
///
102102
/// ```rust
103-
/// # #[cfg(feature = "serde")] mod serde {
104-
/// # use serde_ as serde;
103+
/// # #[cfg(feature = "serde")] mod serde_impl {
104+
/// # use serde as serde;
105105
/// use serde::{Serialize, Deserialize};
106106
/// use rocket::http::Status;
107107
///
108108
/// #[derive(Deserialize, Serialize)]
109-
/// # #[serde(crate = "serde_")]
109+
/// # #[serde(crate = "serde")]
110110
/// struct Foo {
111111
/// status: Status,
112112
/// }
@@ -381,11 +381,11 @@ impl Ord for Status {
381381
}
382382

383383
#[cfg(feature = "serde")]
384-
mod serde {
384+
mod serde_impl {
385385
use super::*;
386386

387-
use serde_::ser::{Serialize, Serializer};
388-
use serde_::de::{Deserialize, Deserializer, Error, Visitor, Unexpected};
387+
use serde::ser::{Serialize, Serializer};
388+
use serde::de::{Deserialize, Deserializer, Error, Visitor, Unexpected};
389389

390390
impl Serialize for Status {
391391
fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {

‎core/http/src/uri/absolute.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -72,19 +72,19 @@ use crate::uri::{Authority, Path, Query, Data, Error, as_utf8_unchecked, fmt};
7272
/// `Absolute` is both `Serialize` and `Deserialize`:
7373
///
7474
/// ```rust
75-
/// # #[cfg(feature = "serde")] mod serde {
76-
/// # use serde_ as serde;
75+
/// # #[cfg(feature = "serde")] mod serde_impl {
76+
/// # use serde as serde;
7777
/// use serde::{Serialize, Deserialize};
7878
/// use rocket::http::uri::Absolute;
7979
///
8080
/// #[derive(Deserialize, Serialize)]
81-
/// # #[serde(crate = "serde_")]
81+
/// # #[serde(crate = "serde")]
8282
/// struct UriOwned {
8383
/// uri: Absolute<'static>,
8484
/// }
8585
///
8686
/// #[derive(Deserialize, Serialize)]
87-
/// # #[serde(crate = "serde_")]
87+
/// # #[serde(crate = "serde")]
8888
/// struct UriBorrowed<'a> {
8989
/// uri: Absolute<'a>,
9090
/// }

‎core/http/src/uri/asterisk.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ use crate::uri::Error;
88
/// `Asterisk` is both `Serialize` and `Deserialize`:
99
///
1010
/// ```rust
11-
/// # #[cfg(feature = "serde")] mod serde {
12-
/// # use serde_ as serde;
11+
/// # #[cfg(feature = "serde")] mod serde_impl {
12+
/// # use serde as serde;
1313
/// use serde::{Serialize, Deserialize};
1414
/// use rocket::http::uri::Asterisk;
1515
///
1616
/// #[derive(Deserialize, Serialize)]
17-
/// # #[serde(crate = "serde_")]
17+
/// # #[serde(crate = "serde")]
1818
/// struct UriOwned {
1919
/// uri: Asterisk,
2020
/// }

‎core/http/src/uri/authority.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@ use crate::uri::{as_utf8_unchecked, error::Error};
2525
/// `Authority` is both `Serialize` and `Deserialize`:
2626
///
2727
/// ```rust
28-
/// # #[cfg(feature = "serde")] mod serde {
29-
/// # use serde_ as serde;
28+
/// # #[cfg(feature = "serde")] mod serde_impl {
29+
/// # use serde as serde;
3030
/// use serde::{Serialize, Deserialize};
3131
/// use rocket::http::uri::Authority;
3232
///
3333
/// #[derive(Deserialize, Serialize)]
34-
/// # #[serde(crate = "serde_")]
34+
/// # #[serde(crate = "serde")]
3535
/// struct UriOwned {
3636
/// uri: Authority<'static>,
3737
/// }
3838
///
3939
/// #[derive(Deserialize, Serialize)]
40-
/// # #[serde(crate = "serde_")]
40+
/// # #[serde(crate = "serde")]
4141
/// struct UriBorrowed<'a> {
4242
/// uri: Authority<'a>,
4343
/// }

‎core/http/src/uri/fmt/uri_display.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -505,8 +505,8 @@ impl<K: UriDisplay<Query>, V: UriDisplay<Query>> UriDisplay<Query> for BTreeMap<
505505
}
506506
}
507507

508-
#[cfg(feature = "uuid")] impl_with_display!(uuid_::Uuid);
509-
#[cfg(feature = "uuid")] crate::impl_from_uri_param_identity!(uuid_::Uuid);
508+
#[cfg(feature = "uuid")] impl_with_display!(uuid::Uuid);
509+
#[cfg(feature = "uuid")] crate::impl_from_uri_param_identity!(uuid::Uuid);
510510

511511
// And finally, the `Ignorable` trait, which has sugar of `_` in the `uri!`
512512
// macro, which expands to a typecheck.

‎core/http/src/uri/host.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -69,19 +69,19 @@ use crate::uri::{Absolute, Authority};
6969
/// `Host` is both `Serialize` and `Deserialize`:
7070
///
7171
/// ```rust
72-
/// # #[cfg(feature = "serde")] mod serde {
73-
/// # use serde_ as serde;
72+
/// # #[cfg(feature = "serde")] mod serde_impl {
73+
/// # use serde as serde;
7474
/// use serde::{Serialize, Deserialize};
7575
/// use rocket::http::uri::Host;
7676
///
7777
/// #[derive(Deserialize, Serialize)]
78-
/// # #[serde(crate = "serde_")]
78+
/// # #[serde(crate = "serde")]
7979
/// struct UriOwned {
8080
/// uri: Host<'static>,
8181
/// }
8282
///
8383
/// #[derive(Deserialize, Serialize)]
84-
/// # #[serde(crate = "serde_")]
84+
/// # #[serde(crate = "serde")]
8585
/// struct UriBorrowed<'a> {
8686
/// uri: Host<'a>,
8787
/// }

‎core/http/src/uri/origin.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -93,19 +93,19 @@ use crate::{RawStr, RawStrBuf};
9393
/// `Origin` is both `Serialize` and `Deserialize`:
9494
///
9595
/// ```rust
96-
/// # #[cfg(feature = "serde")] mod serde {
97-
/// # use serde_ as serde;
96+
/// # #[cfg(feature = "serde")] mod serde_impl {
97+
/// # use serde as serde;
9898
/// use serde::{Serialize, Deserialize};
9999
/// use rocket::http::uri::Origin;
100100
///
101101
/// #[derive(Deserialize, Serialize)]
102-
/// # #[serde(crate = "serde_")]
102+
/// # #[serde(crate = "serde")]
103103
/// struct UriOwned {
104104
/// uri: Origin<'static>,
105105
/// }
106106
///
107107
/// #[derive(Deserialize, Serialize)]
108-
/// # #[serde(crate = "serde_")]
108+
/// # #[serde(crate = "serde")]
109109
/// struct UriBorrowed<'a> {
110110
/// uri: Origin<'a>,
111111
/// }

‎core/http/src/uri/reference.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -51,19 +51,19 @@ use crate::parse::{Extent, IndexedStr};
5151
/// `Reference` is both `Serialize` and `Deserialize`:
5252
///
5353
/// ```rust
54-
/// # #[cfg(feature = "serde")] mod serde {
55-
/// # use serde_ as serde;
54+
/// # #[cfg(feature = "serde")] mod serde_impl {
55+
/// # use serde as serde;
5656
/// use serde::{Serialize, Deserialize};
5757
/// use rocket::http::uri::Reference;
5858
///
5959
/// #[derive(Deserialize, Serialize)]
60-
/// # #[serde(crate = "serde_")]
60+
/// # #[serde(crate = "serde")]
6161
/// struct UriOwned {
6262
/// uri: Reference<'static>,
6363
/// }
6464
///
6565
/// #[derive(Deserialize, Serialize)]
66-
/// # #[serde(crate = "serde_")]
66+
/// # #[serde(crate = "serde")]
6767
/// struct UriBorrowed<'a> {
6868
/// uri: Reference<'a>,
6969
/// }

‎core/http/src/uri/uri.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -365,13 +365,13 @@ impl_uri_from!(Asterisk);
365365
macro_rules! impl_serde {
366366
($T:ty, $expected:literal) => {
367367
#[cfg(feature = "serde")]
368-
mod serde {
368+
mod serde_impl {
369369
use std::fmt;
370370
use std::marker::PhantomData;
371371
use super::*;
372372

373-
use serde_::ser::{Serialize, Serializer};
374-
use serde_::de::{Deserialize, Deserializer, Error, Visitor};
373+
use serde::ser::{Serialize, Serializer};
374+
use serde::de::{Deserialize, Deserializer, Error, Visitor};
375375

376376
impl<'a> Serialize for $T {
377377
fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {

0 commit comments

Comments
 (0)