diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-03-18 11:25:00 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-03-18 11:25:00 -0600 |
| commit | 99cf9dbfc107bacb84dfe5afa9539a0ede3beac2 (patch) | |
| tree | cc36210329cb1a31709a03685c05c4aaa99407e3 /components/script/dom/formdata.rs | |
| parent | 65d4b12bf20783ea784f1c61f4b33ec0fc975f4f (diff) | |
| parent | 5f15eb5fbfb7a8649132cc8b3a07314389836714 (diff) | |
| download | servo-99cf9dbfc107bacb84dfe5afa9539a0ede3beac2.tar.gz servo-99cf9dbfc107bacb84dfe5afa9539a0ede3beac2.zip | |
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
Diffstat (limited to 'components/script/dom/formdata.rs')
| -rw-r--r-- | components/script/dom/formdata.rs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/components/script/dom/formdata.rs b/components/script/dom/formdata.rs index 5d8e5a8f809..a40e269aaaa 100644 --- a/components/script/dom/formdata.rs +++ b/components/script/dom/formdata.rs @@ -84,8 +84,10 @@ impl<'a> FormDataMethods for JSRef<'a, FormData> { #[allow(unsafe_blocks)] fn Get(self, name: DOMString) -> Option<FileOrString> { - if self.data.borrow().contains_key(&name) { - match (*self.data.borrow())[name][0].clone() { + // FIXME(https://github.com/rust-lang/rust/issues/23338) + let data = self.data.borrow(); + if data.contains_key(&name) { + match data[name][0].clone() { FormDatum::StringData(ref s) => Some(eString(s.clone())), FormDatum::FileData(ref f) => { Some(eFile(Unrooted::from_js(*f))) @@ -97,7 +99,9 @@ impl<'a> FormDataMethods for JSRef<'a, FormData> { } 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) } #[allow(unrooted_must_root)] fn Set(self, name: DOMString, value: JSRef<Blob>, filename: Option<DOMString>) { |