diff options
author | Alexander Lopatin <alopatindev@gmail.com> | 2016-02-07 02:55:21 +0300 |
---|---|---|
committer | Alexander Lopatin <alopatindev@gmail.com> | 2016-02-07 02:55:21 +0300 |
commit | 2be49404be8885d97735792c2833d4e8b1cb007f (patch) | |
tree | cb2f9e5bbf954ed8fffde7abfa01dbed329048e6 /components/script/dom/formdata.rs | |
parent | 7c249b1d539c37ab54e9fabfaf0442a5ac0243a9 (diff) | |
download | servo-2be49404be8885d97735792c2833d4e8b1cb007f.tar.gz servo-2be49404be8885d97735792c2833d4e8b1cb007f.zip |
Fix #9508: Beautify our union enums constructors
Diffstat (limited to 'components/script/dom/formdata.rs')
-rw-r--r-- | components/script/dom/formdata.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/components/script/dom/formdata.rs b/components/script/dom/formdata.rs index 574e702e522..3055e182be6 100644 --- a/components/script/dom/formdata.rs +++ b/components/script/dom/formdata.rs @@ -5,7 +5,7 @@ use dom::bindings::cell::DOMRefCell; use dom::bindings::codegen::Bindings::FormDataBinding; use dom::bindings::codegen::Bindings::FormDataBinding::FormDataMethods; -use dom::bindings::codegen::UnionTypes::BlobOrUSVString::{self, eBlob, eUSVString}; +use dom::bindings::codegen::UnionTypes::BlobOrUSVString; use dom::bindings::error::{Fallible}; use dom::bindings::global::GlobalRef; use dom::bindings::inheritance::Castable; @@ -88,8 +88,8 @@ impl FormDataMethods for FormData { self.data.borrow() .get(&Atom::from(&*name.0)) .map(|entry| match entry[0] { - FormDatum::StringData(ref s) => eUSVString(USVString(s.clone())), - FormDatum::BlobData(ref b) => eBlob(Root::from_ref(&*b)), + FormDatum::StringData(ref s) => BlobOrUSVString::USVString(USVString(s.clone())), + FormDatum::BlobData(ref b) => BlobOrUSVString::Blob(Root::from_ref(&*b)), }) } @@ -99,8 +99,8 @@ impl FormDataMethods for FormData { .get(&Atom::from(&*name.0)) .map_or(vec![], |data| data.iter().map(|item| match *item { - FormDatum::StringData(ref s) => eUSVString(USVString(s.clone())), - FormDatum::BlobData(ref b) => eBlob(Root::from_ref(&*b)), + FormDatum::StringData(ref s) => BlobOrUSVString::USVString(USVString(s.clone())), + FormDatum::BlobData(ref b) => BlobOrUSVString::Blob(Root::from_ref(&*b)), }).collect() ) } @@ -114,8 +114,8 @@ impl FormDataMethods for FormData { // https://xhr.spec.whatwg.org/#dom-formdata-set fn Set(&self, name: USVString, value: BlobOrUSVString) { let val = match value { - eUSVString(s) => FormDatum::StringData(s.0), - eBlob(b) => FormDatum::BlobData(JS::from_rooted(&b)) + BlobOrUSVString::USVString(s) => FormDatum::StringData(s.0), + BlobOrUSVString::Blob(b) => FormDatum::BlobData(JS::from_rooted(&b)) }; self.data.borrow_mut().insert(Atom::from(&*name.0), vec!(val)); } |