convert match to if let for location header check #7969

servo · Oct 12, 2015 · 4b363d2 · 4b363d2
1 parent 7b904ef
commit 4b363d2
Showing 1 changed file with 34 additions and 40 deletions.
diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs
@@ -635,51 +635,45 @@ pub fn load<A>(load_data: LoadData,
 
         // --- Loop if there's a redirect
         if response.status().class() == StatusClass::Redirection {
-            match response.headers().get::<Location>() {
-                Some(&Location(ref new_url)) => {
-                    // CORS (https://fetch.spec.whatwg.org/#http-fetch, status section, point 9, 10)
-                    match load_data.cors {
-                        Some(ref c) => {
-                            if c.preflight {
-                                return Err(
-                                    LoadError::Cors(
-                                        url,
-                                        "Preflight fetch inconsistent with main fetch".to_owned()));
-                            } else {
-                                // XXXManishearth There are some CORS-related steps here,
-                                // but they don't seem necessary until credentials are implemented
-                            }
-                        }
-                        _ => {}
-                    }
-
-                    let new_doc_url = match UrlParser::new().base_url(&doc_url).parse(&new_url) {
-                        Ok(u) => u,
-                        Err(e) => {
-                            return Err(LoadError::InvalidRedirect(doc_url, e.to_string()));
-                        }
-                    };
-
-                    info!("redirecting to {}", new_doc_url);
-                    url = replace_hosts(&new_doc_url);
-                    doc_url = new_doc_url;
-
-                    // According to https://tools.ietf.org/html/rfc7231#section-6.4.2,
-                    // historically UAs have rewritten POST->GET on 301 and 302 responses.
-                    if method == Method::Post &&
-                        (response.status() == StatusCode::MovedPermanently ||
-                         response.status() == StatusCode::Found) {
-                        method = Method::Get;
+            if let Some(&Location(ref new_url)) = response.headers().get::<Location>() {
+                // CORS (https://fetch.spec.whatwg.org/#http-fetch, status section, point 9, 10)
+                if let Some(ref c) = load_data.cors {
+                    if c.preflight {
+                        return Err(
+                            LoadError::Cors(
+                                url,
+                                "Preflight fetch inconsistent with main fetch".to_owned()));
+                    } else {
+                        // XXXManishearth There are some CORS-related steps here,
+                        // but they don't seem necessary until credentials are implemented
                     }
+                }
 
-                    if redirected_to.contains(&url) {
-                        return Err(LoadError::InvalidRedirect(doc_url, "redirect loop".to_owned()));
+                let new_doc_url = match UrlParser::new().base_url(&doc_url).parse(&new_url) {
+                    Ok(u) => u,
+                    Err(e) => {
+                        return Err(LoadError::InvalidRedirect(doc_url, e.to_string()));
                     }
+                };
+
+                info!("redirecting to {}", new_doc_url);
+                url = replace_hosts(&new_doc_url);
+                doc_url = new_doc_url;
+
+                // According to https://tools.ietf.org/html/rfc7231#section-6.4.2,
+                // historically UAs have rewritten POST->GET on 301 and 302 responses.
+                if method == Method::Post &&
+                    (response.status() == StatusCode::MovedPermanently ||
+                        response.status() == StatusCode::Found) {
+                    method = Method::Get;
+                }
 
-                    redirected_to.insert(doc_url.clone());
-                    continue;
+                if redirected_to.contains(&url) {
+                    return Err(LoadError::InvalidRedirect(doc_url, "redirect loop".to_owned()));
                 }
-                None => ()
+
+                redirected_to.insert(doc_url.clone());
+                continue;
             }
         }