Cleanup Window, XHR

3 files changed, 14 insertions, 16 deletions

diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs
index 43e4ca6e642..82e3247dc8e 100644
--- a/components/script/dom/window.rs
+++ b/components/script/dom/window.rs
@@ -269,19 +269,19 @@ impl Window {
         (box SendableMainThreadScriptChan(tx), box rx)
     }
 
-    pub fn image_cache_task<'a>(&'a self) -> &'a ImageCacheTask {
+    pub fn image_cache_task(&self) -> &ImageCacheTask {
         &self.image_cache_task
     }
 
-    pub fn compositor<'a>(&'a self) -> &'a IpcSender<ScriptToCompositorMsg> {
+    pub fn compositor(&self) -> &IpcSender<ScriptToCompositorMsg> {
         &self.compositor
     }
 
-    pub fn browsing_context<'a>(&'a self) -> Ref<'a, Option<BrowsingContext>> {
+    pub fn browsing_context(&self) -> Ref<Option<BrowsingContext>> {
         self.browsing_context.borrow()
     }
 
-    pub fn page<'a>(&'a self) -> &'a Page {
+    pub fn page(&self) -> &Page {
         &*self.page
     }
 
diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs
index e28482e3f16..577416fe700 100644
--- a/components/script/dom/xmlhttprequest.rs
+++ b/components/script/dom/xmlhttprequest.rs
@@ -784,19 +784,17 @@ impl<'a> PrivateXMLHttpRequestHelpers for &'a XMLHttpRequest {
 
     fn process_headers_available(self, cors_request: Option<CORSRequest>,
                                  gen_id: GenerationId, metadata: Metadata) -> Result<(), Error> {
-        match cors_request {
-            Some(ref req) => {
-                match metadata.headers {
-                    Some(ref h) if allow_cross_origin_request(req, h) => {},
-                    _ => {
-                        self.process_partial_response(XHRProgress::Errored(gen_id, Network));
-                        return Err(Network);
-                    }
+
+        if let Some(ref req) = cors_request {
+            match metadata.headers {
+                Some(ref h) if allow_cross_origin_request(req, h) => {},
+                _ => {
+                    self.process_partial_response(XHRProgress::Errored(gen_id, Network));
+                    return Err(Network);
                 }
-            },
+            }
+        }
 
-            _ => {}
-        };
         // XXXManishearth Clear cache entries in case of a network error
         self.process_partial_response(XHRProgress::HeadersReceived(gen_id,
                                                                    metadata.headers,
diff --git a/components/script/dom/xmlhttprequesteventtarget.rs b/components/script/dom/xmlhttprequesteventtarget.rs
index d93746fed0f..3bf1aa408b0 100644
--- a/components/script/dom/xmlhttprequesteventtarget.rs
+++ b/components/script/dom/xmlhttprequesteventtarget.rs
@@ -28,7 +28,7 @@ impl XMLHttpRequestEventTarget {
     }
 
     #[inline]
-    pub fn eventtarget<'a>(&'a self) -> &'a EventTarget {
+    pub fn eventtarget(&self) -> &EventTarget {
         &self.eventtarget
     }
 }