servo: Merge #9840 - Update to rust-url 1.0 (from servo:url-1.0); r=a…

…sajeffrey **Do not merge yet:** rust-url 1.0 is not published yet and may still get breaking changes. The goal of this PR for now is to demonstrate API usage. Depends on: * <s>https://github.com/servo/rust-url/pull/176</s> * <s>https://github.com/alexcrichton/cookie-rs/pull/42</s> * <s>https://github.com/hyperium/hyper/pull/740</s> * https://github.com/cyderize/rust-websocket/pull/70 * mozilla/webdriver-rust#28 Source-Repo: https://github.com/servo/servo Source-Revision: 84ab7e9fe8f4a6528995eff3eb6e814cb724c364 UltraBlame original commit: 6da38378a33a0b292803ee9f46fd03ed7ecd4968
marco-c · Oct 1, 2019 · 8f8be59 · 8f8be59
1 parent dd6e854
commit 8f8be59
Show file tree

Hide file tree

Showing 75 changed files with 3,053 additions and 3,867 deletions.
diff --git a/servo/components/compositing/Cargo.toml b/servo/components/compositing/Cargo.toml
@@ -656,11 +656,11 @@ url
 version
 =
 "
-0
+1
 .
-5
+0
 .
-7
+0
 "
 features
 =

diff --git a/servo/components/compositing/constellation.rs b/servo/components/compositing/constellation.rs
@@ -15299,7 +15299,7 @@ pipeline
 .
 url
 .
-serialize
+to_string
 (
 )
 )

diff --git a/servo/components/devtools/Cargo.toml b/servo/components/devtools/Cargo.toml
@@ -130,7 +130,7 @@ version
 "
 0
 .
-8
+9
 "
 features
 =

diff --git a/servo/components/devtools/actors/network_event.rs b/servo/components/devtools/actors/network_event.rs
@@ -1578,7 +1578,11 @@ request
 .
 url
 .
-serialize
+as_str
+(
+)
+.
+to_owned
 (
 )
 ;

diff --git a/servo/components/devtools/lib.rs b/servo/components/devtools/lib.rs
@@ -1843,7 +1843,7 @@ url
 :
 url
 .
-serialize
+into_string
 (
 )
 console

diff --git a/servo/components/devtools_traits/Cargo.toml b/servo/components/devtools_traits/Cargo.toml
@@ -122,7 +122,7 @@ version
 "
 0
 .
-8
+9
 "
 features
 =
@@ -168,11 +168,11 @@ url
 version
 =
 "
-0
+1
 .
-5
+0
 .
-7
+0
 "
 features
 =

diff --git a/servo/components/gfx/Cargo.toml b/servo/components/gfx/Cargo.toml
@@ -260,11 +260,11 @@ url
 version
 =
 "
-0
+1
 .
-5
+0
 .
-7
+0
 "
 features
 =

diff --git a/servo/components/layout/Cargo.toml b/servo/components/layout/Cargo.toml
@@ -526,11 +526,11 @@ url
 version
 =
 "
-0
+1
 .
-5
+0
 .
-7
+0
 "
 features
 =

diff --git a/servo/components/layout/layout_thread.rs b/servo/components/layout/layout_thread.rs
@@ -7115,17 +7115,14 @@ for
 {
 }
 "
+*
 self
 .
 url
 .
 borrow
 (
 )
-.
-serialize
-(
-)
 )
 ;
 let
@@ -7430,17 +7427,14 @@ for
 {
 }
 "
+*
 self
 .
 url
 .
 borrow
 (
 )
-.
-serialize
-(
-)
 )
 ;
 if
@@ -10287,7 +10281,7 @@ borrow
 (
 )
 .
-serialize
+to_string
 (
 )
 iframe

diff --git a/servo/components/layout_traits/Cargo.toml b/servo/components/layout_traits/Cargo.toml
@@ -188,11 +188,11 @@ url
 version
 =
 "
-0
+1
 .
-5
+0
 .
-7
+0
 "
 features
 =

diff --git a/servo/components/msg/Cargo.toml b/servo/components/msg/Cargo.toml
@@ -223,7 +223,7 @@ version
 "
 0
 .
-8
+9
 "
 features
 =
@@ -266,11 +266,11 @@ url
 version
 =
 "
-0
+1
 .
-5
+0
 .
-7
+0
 "
 features
 =

diff --git a/servo/components/net/Cargo.toml b/servo/components/net/Cargo.toml
@@ -201,7 +201,7 @@ version
 "
 0
 .
-8
+9
 "
 features
 =
@@ -231,6 +231,13 @@ log
 .
 5
 "
+matches
+=
+"
+0
+.
+1
+"
 mime
 =
 "
@@ -298,18 +305,23 @@ url
 version
 =
 "
-0
+1
 .
-5
+0
 .
-7
+0
 "
 features
 =
 [
 "
 heap_size
 "
+"
+rustc
+-
+serialize
+"
 ]
 }
 uuid
@@ -335,9 +347,7 @@ websocket
 "
 0
 .
-16
-.
-1
+17
 "
 [
 target

diff --git a/servo/components/net/about_loader.rs b/servo/components/net/about_loader.rs
@@ -250,21 +250,12 @@ clone
 (
 )
 ;
-let
-non_relative_scheme_data
-=
+match
 url
 .
-non_relative_scheme_data
-(
-)
-.
-unwrap
+path
 (
 )
-;
-match
-non_relative_scheme_data
 {
 "
 blank
@@ -422,7 +413,11 @@ mut
 load_data
 &
 (
-non_relative_scheme_data
+url
+.
+path
+(
+)
 .
 to_owned
 (
-Original file line number
+Diff line change
@@ Expand Up / @@ -656,11 +656,11 @@ url @@
     version
     =
     "
     .
     .
     "
     features
     =
@@ Expand Down @@