auto merge of #5256 : servo/servo/rustup_20150311, r=jdm

...v.

Relies on:
* https://github.com/servo/rust-geom/pull/72
* https://github.com/servo/rust-glx/pull/10
* https://github.com/servo/gleam/pull/15
* https://github.com/servo/rust-mozjs/pull/137
* https://github.com/servo/rust-core-text/pull/35
* https://github.com/servo/rust-io-surface/pull/28

1 files changed, 10 insertions, 3 deletions

diff --git a/components/script/dom/urlsearchparams.rs b/components/script/dom/urlsearchparams.rs
index b76504f4137..a8cfa3caf7d 100644
--- a/components/script/dom/urlsearchparams.rs
+++ b/components/script/dom/urlsearchparams.rs
@@ -53,7 +53,10 @@ impl URLSearchParams {
                 let u = u.root();
                 let usp = usp.r();
                 let mut map = usp.data.borrow_mut();
-                *map = u.r().data.borrow().clone();
+                // FIXME(https://github.com/rust-lang/rust/issues/23338)
+                let r = u.r();
+                let data = r.data.borrow();
+                *map = data.clone();
             },
             None => {}
         }
@@ -81,11 +84,15 @@ impl<'a> URLSearchParamsMethods for JSRef<'a, URLSearchParams> {
     }
 
     fn Get(self, name: DOMString) -> Option<DOMString> {
-        self.data.borrow().get(&name).map(|v| v[0].clone())
+        // FIXME(https://github.com/rust-lang/rust/issues/23338)
+        let data = self.data.borrow();
+        data.get(&name).map(|v| v[0].clone())
     }
 
     fn Has(self, name: DOMString) -> bool {
-        self.data.borrow().contains_key(&name)
+        // FIXME(https://github.com/rust-lang/rust/issues/23338)
+        let data = self.data.borrow();
+        data.contains_key(&name)
     }
 
     fn Set(self, name: DOMString, value: DOMString) {