33 tests to go.

Author: o0Ignition0o

src/quirks.rs

@@ -99,14 +99,13 @@ pub fn host(url: &Url) -> &str {
 
 /// Setter for https://url.spec.whatwg.org/#dom-url-host
 pub fn set_host(url: &mut Url, new_host: &str) -> Result<(), ()> {
+    // If context object’s url’s cannot-be-a-base-URL flag is set, then return.
+    if url.cannot_be_a_base() {
+        return Err(());
+    }
     let host;
     let opt_port;
     {
-        // If context object’s url’s cannot-be-a-base-URL flag is set, then return.
-        if url.cannot_be_a_base() {
-            return Err(());
-        }
-
         let scheme = url.scheme();
         let result = Parser::parse_host(Input::new(new_host), SchemeType::from(scheme));
         match result {
@@ -202,18 +201,19 @@ pub fn pathname(url: &Url) -> &str {
 
 /// Setter for https://url.spec.whatwg.org/#dom-url-pathname
 pub fn set_pathname(url: &mut Url, new_pathname: &str) {
-    if !url.cannot_be_a_base() && !new_pathname.is_empty() {
-        if !SchemeType::from(url.scheme()).is_special()
+    if !url.cannot_be_a_base() {
+        return;
+    }
+    if !SchemeType::from(url.scheme()).is_special()
             || Some('/') == new_pathname.chars().nth(0)
             // \\ is a segment delimiter for 'special' URLs"
             || Some('\\') == new_pathname.chars().nth(0)
-        {
-            url.set_path(new_pathname)
-        } else {
-            let mut path_to_set = String::from("/");
-            path_to_set.push_str(new_pathname);
-            url.set_path(&path_to_set)
-        }
+    {
+        url.set_path(new_pathname)
+    } else {
+        let mut path_to_set = String::from("/");
+        path_to_set.push_str(new_pathname);
+        url.set_path(&path_to_set)
     }
 }