Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 21:20:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use a match rather than unwrap() in main_fetch.

Browse source
This commit is contained in:
Ms2ger 2016-03-10 14:07:41 +01:00
parent 95883dcbcf
commit 91d63d5fcf
1 changed files with 35 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/net/fetch/methods.rs
View file

@ -138,8 +138,9 @@ fn main_fetch(request: Rc<Request>, cors_flag: bool, recursive_flag: bool) -> Re
// this step is obsoleted by fetch_async // this step is obsoleted by fetch_async
// Step 9 // Step 9
let response = if response.is_none() { let response = match response {
Some(response) => response,
None => {
let current_url = request.current_url(); let current_url = request.current_url();
let same_origin = if let Origin::Origin(ref origin) = *request.origin.borrow() { let same_origin = if let Origin::Origin(ref origin) = *request.origin.borrow() {
*origin == current_url.origin() *origin == current_url.origin()
@ -181,8 +182,7 @@ fn main_fetch(request: Rc<Request>, cors_flag: bool, recursive_flag: bool) -> Re
request.response_tainting.set(ResponseTainting::CORSTainting); request.response_tainting.set(ResponseTainting::CORSTainting);
http_fetch(request.clone(), BasicCORSCache::new(), true, false, false) http_fetch(request.clone(), BasicCORSCache::new(), true, false, false)
} }
} else { }
response.unwrap()
}; };
// Step 10 // Step 10