Skip to content

Commit 047d334

Browse files
authored
Merge branch 'master' into no_std
2 parents b0bb942 + 86730f1 commit 047d334

File tree

10 files changed

+573
-335
lines changed

10 files changed

+573
-335
lines changed

data-url/Cargo.toml

+3
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,6 @@ test = false
2626
[[test]]
2727
name = "wpt"
2828
harness = false
29+
30+
[package.metadata.docs.rs]
31+
rustdoc-args = ["--generate-link-to-definition"]

data-url/src/forgiving_base64.rs

+3
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ impl fmt::Display for InvalidBase64 {
2121
}
2222
}
2323

24+
#[cfg(feature = "std")]
25+
impl std::error::Error for InvalidBase64 {}
26+
2427
#[derive(Debug)]
2528
enum InvalidBase64Details {
2629
UnexpectedSymbol(u8),

form_urlencoded/Cargo.toml

+3
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,6 @@ alloc = ["percent-encoding/alloc"]
1919

2020
[dependencies]
2121
percent-encoding = { version = "2.3.0", default-features = false, path = "../percent_encoding" }
22+
23+
[package.metadata.docs.rs]
24+
rustdoc-args = ["--generate-link-to-definition"]

idna/Cargo.toml

+3
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,6 @@ unicode-normalization = { version = "0.1.22", default-features = false }
4040
[[bench]]
4141
name = "all"
4242
harness = false
43+
44+
[package.metadata.docs.rs]
45+
rustdoc-args = ["--generate-link-to-definition"]

percent_encoding/Cargo.toml

+3
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,6 @@ rust-version = "1.51"
1313
default = ["std"]
1414
std = ["alloc"]
1515
alloc = []
16+
17+
[package.metadata.docs.rs]
18+
rustdoc-args = ["--generate-link-to-definition"]

url/Cargo.toml

+7
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ edition = "2018"
1717
rust-version = "1.56"
1818

1919
[dev-dependencies]
20+
serde = { version = "1.0", features = ["derive"] }
2021
serde_json = "1.0"
2122
bencher = "0.1"
2223

@@ -41,13 +42,19 @@ no_std_net = ["no-std-net"]
4142
# For no_std: Use errors_in_core and net_in_core
4243
unstable = ["idna/unstable"]
4344

45+
[[test]]
46+
name = "url_wpt"
47+
path = "tests/wpt.rs"
48+
harness = false
49+
4450
[[bench]]
4551
name = "parse_url"
4652
path = "benches/parse_url.rs"
4753
harness = false
4854

4955
[package.metadata.docs.rs]
5056
features = ["serde"]
57+
rustdoc-args = ["--generate-link-to-definition"]
5158

5259
[package.metadata.playground]
5360
features = ["serde"]

url/tests/data.rs

-260
This file was deleted.

url/tests/expected_failures.txt

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
</> against <file://h/C:/a/b>
2+
<file:\\\\//> against <about:blank>
3+
<file:\\\\\\\\> against <about:blank>
4+
<file:\\\\\\\\?fox> against <about:blank>
5+
<file:\\\\\\\\#guppy> against <about:blank>
6+
<file://spider///> against <about:blank>
7+
<file:\\\\localhost//> against <about:blank>
8+
<file://\\/localhost//cat> against <about:blank>
9+
<file://localhost//a//../..//> against <about:blank>
10+
</////mouse> against <file:///elephant>
11+
<\\/localhost//pig> against <file://lion/>
12+
<//localhost//pig> against <file://lion/>
13+
</..//localhost//pig> against <file://lion/>
14+
<C|> against <file://host/dir/file>
15+
<C|> against <file://host/D:/dir1/dir2/file>
16+
<C|#> against <file://host/dir/file>
17+
<C|?> against <file://host/dir/file>
18+
<C|/> against <file://host/dir/file>
19+
<C|\n/> against <file://host/dir/file>
20+
<C|\\> against <file://host/dir/file>
21+
</c:/foo/bar> against <file://host/path>
22+
<file://example.net/C:/> against <about:blank>
23+
<file://1.2.3.4/C:/> against <about:blank>
24+
<file://[1::8]/C:/> against <about:blank>
25+
<C|/> against <file://host/>
26+
</C:/> against <file://host/>
27+
<file:C:/> against <file://host/>
28+
<file:/C:/> against <file://host/>
29+
<file://localhost//a//../..//foo> against <about:blank>
30+
<file://localhost////foo> against <about:blank>
31+
<file:////foo> against <about:blank>
32+
<file:////one/two> against <file:///>
33+
<////one/two> against <file:///>
34+
<file:///.//> against <file:////>
35+
<file:.//p> against <about:blank>
36+
<file:/.//p> against <about:blank>
37+
<https://x/?#\u{0}y> against <about:blank>

0 commit comments

Comments
 (0)