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

Auto merge of #8926 - frewsxcv:no-map, r=SimonSapin

Browse source 
Prefer 'if let' over 'map() with side effects'

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8926)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-12-11 06:53:36 +05:30
commit 0abddae49d
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
components/script/dom/xmlhttprequest.rs
View file

@ -577,12 +577,20 @@ impl XMLHttpRequestMethods for XMLHttpRequest {
let mut buf = String::new(); let mut buf = String::new();
buf.push_str(&referer_url.scheme); buf.push_str(&referer_url.scheme);
buf.push_str("://"); buf.push_str("://");
referer_url.serialize_host().map(|ref h| buf.push_str(h));
referer_url.port().as_ref().map(|&p| { if let Some(ref h) = referer_url.serialize_host() {
buf.push_str(h);
}
if let Some(ref p) = referer_url.port().as_ref() {
buf.push_str(":"); buf.push_str(":");
buf.push_str(&p.to_string()); buf.push_str(&p.to_string());
}); }
referer_url.serialize_path().map(|ref h| buf.push_str(h));
if let Some(ref h) = referer_url.serialize_path() {
buf.push_str(h);
}
self.request_headers.borrow_mut().set_raw("Referer".to_owned(), vec![buf.into_bytes()]); self.request_headers.borrow_mut().set_raw("Referer".to_owned(), vec![buf.into_bytes()]);
}, },
Ok(Some(ref req)) => self.insert_trusted_header("origin".to_owned(), Ok(Some(ref req)) => self.insert_trusted_header("origin".to_owned(),