diff options
Diffstat (limited to 'components/script/dom/xmlhttprequest.rs')
| -rw-r--r-- | components/script/dom/xmlhttprequest.rs | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs index 12fba1ff2e8..785a5928c9f 100644 --- a/components/script/dom/xmlhttprequest.rs +++ b/components/script/dom/xmlhttprequest.rs @@ -236,16 +236,15 @@ impl XMLHttpRequest { self.xhr.root().process_data_available(self.gen_id, self.buf.borrow().clone()); } fn process_response_eof(&mut self, response: Result<(), NetworkError>) { - match response { + let rv = match response { Ok(()) => { - let rv = self.xhr.root().process_response_complete(self.gen_id, Ok(())); - *self.sync_status.borrow_mut() = Some(rv); + self.xhr.root().process_response_complete(self.gen_id, Ok(())) } Err(e) => { - let rv = self.xhr.root().process_response_complete(self.gen_id, Err(e)); - *self.sync_status.borrow_mut() = Some(rv); + self.xhr.root().process_response_complete(self.gen_id, Err(e)) } - } + }; + *self.sync_status.borrow_mut() = Some(rv); } } @@ -569,7 +568,7 @@ impl XMLHttpRequestMethods for XMLHttpRequest { CredentialsMode::CredentialsSameOrigin }; let use_url_credentials = if let Some(ref url) = *self.request_url.borrow() { - url.username().len() != 0 || url.password().is_some() + !url.username().is_empty() || url.password().is_some() } else { unreachable!() }; @@ -888,8 +887,6 @@ impl XMLHttpRequest { }, }; - // todo allow cors in mozbrowser - *self.response_url.borrow_mut() = metadata.final_url[..Position::AfterQuery].to_owned(); // XXXManishearth Clear cache entries in case of a network error |