1 files changed, 10 insertions, 10 deletions

diff --git a/tests/unit/net/fetch.rs b/tests/unit/net/fetch.rs
index b2353d33113..8b95314c726 100644
--- a/tests/unit/net/fetch.rs
+++ b/tests/unit/net/fetch.rs
@@ -22,7 +22,7 @@ use std::sync::mpsc::{Sender, channel};
 use std::sync::{Arc, Mutex};
 use time::{self, Duration};
 use unicase::UniCase;
-use url::{Origin as UrlOrigin, OpaqueOrigin, Url};
+use url::{Origin as UrlOrigin, Url};
 
 // TODO write a struct that impls Handler for storing test values
 
@@ -156,7 +156,7 @@ fn test_cors_preflight_fetch() {
     };
     let (mut server, url) = make_server(handler);
 
-    let origin = Origin::Origin(UrlOrigin::UID(OpaqueOrigin::new()));
+    let origin = Origin::Origin(UrlOrigin::new_opaque());
     let mut request = Request::new(url, Some(origin), false);
     request.referer = Referer::NoReferer;
     request.use_cors_preflight = true;
@@ -192,7 +192,7 @@ fn test_cors_preflight_fetch_network_error() {
     };
     let (mut server, url) = make_server(handler);
 
-    let origin = Origin::Origin(UrlOrigin::UID(OpaqueOrigin::new()));
+    let origin = Origin::Origin(UrlOrigin::new_opaque());
     let mut request = Request::new(url, Some(origin), false);
     *request.method.borrow_mut() = Method::Extension("CHICKEN".to_owned());
     request.referer = Referer::NoReferer;
@@ -269,7 +269,7 @@ fn test_fetch_response_is_cors_filtered() {
     let (mut server, url) = make_server(handler);
 
     // an origin mis-match will stop it from defaulting to a basic filtered response
-    let origin = Origin::Origin(UrlOrigin::UID(OpaqueOrigin::new()));
+    let origin = Origin::Origin(UrlOrigin::new_opaque());
     let mut request = Request::new(url, Some(origin), false);
     request.referer = Referer::NoReferer;
     request.mode = RequestMode::CORSMode;
@@ -304,7 +304,7 @@ fn test_fetch_response_is_opaque_filtered() {
     let (mut server, url) = make_server(handler);
 
     // an origin mis-match will fall through to an Opaque filtered response
-    let origin = Origin::Origin(UrlOrigin::UID(OpaqueOrigin::new()));
+    let origin = Origin::Origin(UrlOrigin::new_opaque());
     let mut request = Request::new(url, Some(origin), false);
     request.referer = Referer::NoReferer;
     let wrapped_request = Rc::new(request);
@@ -340,7 +340,7 @@ fn test_fetch_response_is_opaque_redirect_filtered() {
             RequestUri::AbsolutePath(url) =>
                 url.split("/").collect::<String>().parse::<u32>().unwrap_or(0),
             RequestUri::AbsoluteUri(url) =>
-                url.path().unwrap().last().unwrap().split("/").collect::<String>().parse::<u32>().unwrap_or(0),
+                url.path_segments().unwrap().next_back().unwrap().parse::<u32>().unwrap_or(0),
             _ => panic!()
         };
 
@@ -420,7 +420,7 @@ fn setup_server_and_fetch(message: &'static [u8], redirect_cap: u32) -> Response
             RequestUri::AbsolutePath(url) =>
                 url.split("/").collect::<String>().parse::<u32>().unwrap_or(0),
             RequestUri::AbsoluteUri(url) =>
-                url.path().unwrap().last().unwrap().split("/").collect::<String>().parse::<u32>().unwrap_or(0),
+                url.path_segments().unwrap().next_back().unwrap().parse::<u32>().unwrap_or(0),
             _ => panic!()
         };
 
@@ -493,7 +493,7 @@ fn test_fetch_redirect_updates_method_runner(tx: Sender<bool>, status_code: Stat
             RequestUri::AbsolutePath(url) =>
                 url.split("/").collect::<String>().parse::<u32>().unwrap_or(0),
             RequestUri::AbsoluteUri(url) =>
-                url.path().unwrap().last().unwrap().split("/").collect::<String>().parse::<u32>().unwrap_or(0),
+                url.path_segments().unwrap().next_back().unwrap().parse::<u32>().unwrap_or(0),
             _ => panic!()
         };
 
@@ -631,7 +631,7 @@ fn test_opaque_filtered_fetch_async_returns_complete_response() {
     let (mut server, url) = make_server(handler);
 
     // an origin mis-match will fall through to an Opaque filtered response
-    let origin = Origin::Origin(UrlOrigin::UID(OpaqueOrigin::new()));
+    let origin = Origin::Origin(UrlOrigin::new_opaque());
     let mut request = Request::new(url, Some(origin), false);
     request.referer = Referer::NoReferer;
 
@@ -658,7 +658,7 @@ fn test_opaque_redirect_filtered_fetch_async_returns_complete_response() {
             RequestUri::AbsolutePath(url) =>
                 url.split("/").collect::<String>().parse::<u32>().unwrap_or(0),
             RequestUri::AbsoluteUri(url) =>
-                url.path().unwrap().last().unwrap().split("/").collect::<String>().parse::<u32>().unwrap_or(0),
+                url.path_segments().unwrap().last().unwrap().parse::<u32>().unwrap_or(0),
             _ => panic!()
         };