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

Auto merge of #7433 - frewsxcv:formdata-get, r=nox

Browse source 
Cleanup, refactor FormDataMethods::Get



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7433)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-08-30 07:00:33 -06:00
commit 89a5e2b3d0
1 changed files with 6 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

19
components/script/dom/formdata.rs
View file

@ -85,21 +85,14 @@ impl FormDataMethods for FormData {
self.data.borrow_mut().remove(&name); self.data.borrow_mut().remove(&name);
} }
#[allow(unsafe_code)]
// https://xhr.spec.whatwg.org/#dom-formdata-get // https://xhr.spec.whatwg.org/#dom-formdata-get
fn Get(&self, name: DOMString) -> Option<FileOrString> { fn Get(&self, name: DOMString) -> Option<FileOrString> {
// FIXME(https://github.com/rust-lang/rust/issues/23338) self.data.borrow()
let data = self.data.borrow(); .get(&name)
if data.contains_key(&name) { .map(|entry| match entry[0] {
match data[&name][0].clone() { FormDatum::StringData(ref s) => eString(s.clone()),
FormDatum::StringData(ref s) => Some(eString(s.clone())), FormDatum::FileData(ref f) => eFile(f.root()),
FormDatum::FileData(ref f) => { })
Some(eFile(f.root()))
}
}
} else {
None
}
} }
// https://xhr.spec.whatwg.org/#dom-formdata-has // https://xhr.spec.whatwg.org/#dom-formdata-has