Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions url/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ edition = "2018"
rust-version = "1.63" # From libc

[dev-dependencies]
serde = { version = "1.0", features = ["derive"] }
serde = "1.0"
serde_derive = "1.0"
serde_json = "1.0"
bencher = "0.1"

Expand All @@ -28,7 +29,8 @@ wasm-bindgen-test = "0.3"
form_urlencoded = { version = "1.2.2", path = "../form_urlencoded", default-features = false, features = ["alloc"] }
idna = { version = "1.1.0", path = "../idna", default-features = false, features = ["alloc", "compiled_data"] }
percent-encoding = { version = "2.3.2", path = "../percent_encoding", default-features = false, features = ["alloc"] }
serde = { version = "1.0", optional = true, features = ["derive"], default-features = false }
serde = { version = "1.0", optional = true, default-features = false }
serde_derive = { version = "1.0", optional = true, default-features = false }

[features]
default = ["std"]
Expand All @@ -38,6 +40,8 @@ std = ["idna/std", "percent-encoding/std", "form_urlencoded/std", "serde?/std"]
debugger_visualizer = []
# Expose internal offsets of the URL.
expose_internals = []
# Enables serialization and deserialization via serde.
serde = ["dep:serde", "dep:serde_derive"]

[[test]]
name = "url_wpt"
Expand Down
2 changes: 1 addition & 1 deletion url/src/host.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use core::fmt::{self, Formatter};

use percent_encoding::{percent_decode, utf8_percent_encode, CONTROLS};
#[cfg(feature = "serde")]
use serde::{Deserialize, Serialize};
use serde_derive::{Deserialize, Serialize};

use crate::parser::{ParseError, ParseResult};

Expand Down
2 changes: 1 addition & 1 deletion url/tests/unit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1370,7 +1370,7 @@ fn issue_974() {
#[cfg(feature = "serde")]
#[test]
fn serde_error_message() {
use serde::Deserialize;
use serde_derive::Deserialize;
#[derive(Debug, Deserialize)]
#[allow(dead_code)]
struct TypeWithUrl {
Expand Down
12 changes: 6 additions & 6 deletions url/tests/wpt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,23 +64,23 @@ macro_rules! println {
}
}

#[derive(Debug, serde::Deserialize)]
#[derive(Debug, serde_derive::Deserialize)]
struct UrlTest {
input: String,
base: Option<String>,
#[serde(flatten)]
result: UrlTestResult,
}

#[derive(Debug, serde::Deserialize)]
#[derive(Debug, serde_derive::Deserialize)]
#[serde(untagged)]
#[allow(clippy::large_enum_variant)]
enum UrlTestResult {
Ok(UrlTestOk),
Fail(UrlTestFail),
}

#[derive(Debug, serde::Deserialize)]
#[derive(Debug, serde_derive::Deserialize)]
struct UrlTestOk {
href: String,
protocol: String,
Expand All @@ -94,19 +94,19 @@ struct UrlTestOk {
hash: String,
}

#[derive(Debug, serde::Deserialize)]
#[derive(Debug, serde_derive::Deserialize)]
struct UrlTestFail {
failure: bool,
}

#[derive(Debug, serde::Deserialize)]
#[derive(Debug, serde_derive::Deserialize)]
struct SetterTest {
href: String,
new_value: String,
expected: SetterTestExpected,
}

#[derive(Debug, serde::Deserialize)]
#[derive(Debug, serde_derive::Deserialize)]
struct SetterTestExpected {
href: Option<String>,
protocol: Option<String>,
Expand Down
Loading