Fix #9508: Beautify our union enums constructors

13 files changed, 69 insertions, 71 deletions

diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py
index 8d539136802..13b65f53f29 100644
--- a/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/components/script/dom/bindings/codegen/CodegenRust.py
@@ -3636,10 +3636,10 @@ class CGUnionStruct(CGThing):
         templateVars = map(lambda t: getUnionTypeTemplateVars(t, self.descriptorProvider),
                            self.type.flatMemberTypes)
         enumValues = [
-            "    e%s(%s)," % (v["name"], v["typeName"]) for v in templateVars
+            "    %s(%s)," % (v["name"], v["typeName"]) for v in templateVars
         ]
         enumConversions = [
-            "            %s::e%s(ref inner) => inner.to_jsval(cx, rval),"
+            "            %s::%s(ref inner) => inner.to_jsval(cx, rval),"
             % (self.type, v["name"]) for v in templateVars
         ]
         return ("""\
@@ -3681,7 +3681,7 @@ class CGUnionConversionStruct(CGThing):
             return (
                 "match %s::TryConvertTo%s(cx, value) {\n"
                 "    Err(_) => return Err(()),\n"
-                "    Ok(Some(value)) => return Ok(%s::e%s(value)),\n"
+                "    Ok(Some(value)) => return Ok(%s::%s(value)),\n"
                 "    Ok(None) => (),\n"
                 "}\n") % (self.type, name, self.type, name)
 
@@ -3757,7 +3757,7 @@ class CGUnionConversionStruct(CGThing):
             match = (
                 "match %s::TryConvertTo%s(cx, value) {\n"
                 "    Err(_) => return Err(()),\n"
-                "    Ok(Some(value)) => return Ok(%s::e%s(value)),\n"
+                "    Ok(Some(value)) => return Ok(%s::%s(value)),\n"
                 "    Ok(None) => (),\n"
                 "}\n") % (self.type, name, self.type, name)
             conversions.append(CGGeneric(match))
diff --git a/components/script/dom/canvasrenderingcontext2d.rs b/components/script/dom/canvasrenderingcontext2d.rs
index f4f1e2c51a7..7ea623b5bf4 100644
--- a/components/script/dom/canvasrenderingcontext2d.rs
+++ b/components/script/dom/canvasrenderingcontext2d.rs
@@ -228,12 +228,12 @@ impl CanvasRenderingContext2D {
                        image: HTMLImageElementOrHTMLCanvasElementOrCanvasRenderingContext2D)
                            -> bool {
         match image {
-            HTMLImageElementOrHTMLCanvasElementOrCanvasRenderingContext2D::eHTMLCanvasElement(canvas) => {
+            HTMLImageElementOrHTMLCanvasElementOrCanvasRenderingContext2D::HTMLCanvasElement(canvas) => {
                 canvas.origin_is_clean()
             }
-            HTMLImageElementOrHTMLCanvasElementOrCanvasRenderingContext2D::eCanvasRenderingContext2D(image) =>
+            HTMLImageElementOrHTMLCanvasElementOrCanvasRenderingContext2D::CanvasRenderingContext2D(image) =>
                 image.r().origin_is_clean(),
-            HTMLImageElementOrHTMLCanvasElementOrCanvasRenderingContext2D::eHTMLImageElement(image) =>
+            HTMLImageElementOrHTMLCanvasElementOrCanvasRenderingContext2D::HTMLImageElement(image) =>
                 match image.get_url() {
                     None => true,
                     Some(url) => {
@@ -279,19 +279,19 @@ impl CanvasRenderingContext2D {
                   dh: Option<f64>)
                   -> Fallible<()> {
         let result = match image {
-            HTMLImageElementOrHTMLCanvasElementOrCanvasRenderingContext2D::eHTMLCanvasElement(ref canvas) => {
+            HTMLImageElementOrHTMLCanvasElementOrCanvasRenderingContext2D::HTMLCanvasElement(ref canvas) => {
                 self.draw_html_canvas_element(canvas.r(),
                                               sx, sy, sw, sh,
                                               dx, dy, dw, dh)
             }
-            HTMLImageElementOrHTMLCanvasElementOrCanvasRenderingContext2D::eCanvasRenderingContext2D(ref image) => {
+            HTMLImageElementOrHTMLCanvasElementOrCanvasRenderingContext2D::CanvasRenderingContext2D(ref image) => {
                 let context = image.r();
                 let canvas = context.Canvas();
                 self.draw_html_canvas_element(canvas.r(),
                                               sx, sy, sw, sh,
                                               dx, dy, dw, dh)
             }
-            HTMLImageElementOrHTMLCanvasElementOrCanvasRenderingContext2D::eHTMLImageElement(ref image) => {
+            HTMLImageElementOrHTMLCanvasElementOrCanvasRenderingContext2D::HTMLImageElement(ref image) => {
                 let image_element = image.r();
                 // https://html.spec.whatwg.org/multipage/#img-error
                 // If the image argument is an HTMLImageElement object that is in the broken state,
@@ -913,13 +913,13 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
             CanvasFillOrStrokeStyle::Color(ref rgba) => {
                 let mut result = String::new();
                 serialize(rgba, &mut result).unwrap();
-                StringOrCanvasGradientOrCanvasPattern::eString(DOMString::from(result))
+                StringOrCanvasGradientOrCanvasPattern::String(DOMString::from(result))
             },
             CanvasFillOrStrokeStyle::Gradient(ref gradient) => {
-                StringOrCanvasGradientOrCanvasPattern::eCanvasGradient(Root::from_ref(&*gradient))
+                StringOrCanvasGradientOrCanvasPattern::CanvasGradient(Root::from_ref(&*gradient))
             },
             CanvasFillOrStrokeStyle::Pattern(ref pattern) => {
-                StringOrCanvasGradientOrCanvasPattern::eCanvasPattern(Root::from_ref(&*pattern))
+                StringOrCanvasGradientOrCanvasPattern::CanvasPattern(Root::from_ref(&*pattern))
             }
         }
     }
@@ -927,7 +927,7 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
     // https://html.spec.whatwg.org/multipage/#dom-context-2d-strokestyle
     fn SetStrokeStyle(&self, value: StringOrCanvasGradientOrCanvasPattern) {
         match value {
-            StringOrCanvasGradientOrCanvasPattern::eString(string) => {
+            StringOrCanvasGradientOrCanvasPattern::String(string) => {
                 if let Ok(rgba) = self.parse_color(&string) {
                     self.state.borrow_mut().stroke_style = CanvasFillOrStrokeStyle::Color(rgba);
                     self.ipc_renderer
@@ -936,14 +936,14 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
                         .unwrap();
                 }
             },
-            StringOrCanvasGradientOrCanvasPattern::eCanvasGradient(gradient) => {
+            StringOrCanvasGradientOrCanvasPattern::CanvasGradient(gradient) => {
                 self.state.borrow_mut().stroke_style =
                     CanvasFillOrStrokeStyle::Gradient(JS::from_ref(gradient.r()));
                 let msg = CanvasMsg::Canvas2d(
                     Canvas2dMsg::SetStrokeStyle(gradient.to_fill_or_stroke_style()));
                 self.ipc_renderer.send(msg).unwrap();
             },
-            StringOrCanvasGradientOrCanvasPattern::eCanvasPattern(pattern) => {
+            StringOrCanvasGradientOrCanvasPattern::CanvasPattern(pattern) => {
                 self.state.borrow_mut().stroke_style =
                     CanvasFillOrStrokeStyle::Pattern(JS::from_ref(pattern.r()));
                 let msg = CanvasMsg::Canvas2d(
@@ -962,13 +962,13 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
             CanvasFillOrStrokeStyle::Color(ref rgba) => {
                 let mut result = String::new();
                 serialize(rgba, &mut result).unwrap();
-                StringOrCanvasGradientOrCanvasPattern::eString(DOMString::from(result))
+                StringOrCanvasGradientOrCanvasPattern::String(DOMString::from(result))
             },
             CanvasFillOrStrokeStyle::Gradient(ref gradient) => {
-                StringOrCanvasGradientOrCanvasPattern::eCanvasGradient(Root::from_ref(&*gradient))
+                StringOrCanvasGradientOrCanvasPattern::CanvasGradient(Root::from_ref(&*gradient))
             },
             CanvasFillOrStrokeStyle::Pattern(ref pattern) => {
-                StringOrCanvasGradientOrCanvasPattern::eCanvasPattern(Root::from_ref(&*pattern))
+                StringOrCanvasGradientOrCanvasPattern::CanvasPattern(Root::from_ref(&*pattern))
             }
         }
     }
@@ -976,7 +976,7 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
     // https://html.spec.whatwg.org/multipage/#dom-context-2d-strokestyle
     fn SetFillStyle(&self, value: StringOrCanvasGradientOrCanvasPattern) {
         match value {
-            StringOrCanvasGradientOrCanvasPattern::eString(string) => {
+            StringOrCanvasGradientOrCanvasPattern::String(string) => {
                 if let Ok(rgba) = self.parse_color(&string) {
                     self.state.borrow_mut().fill_style = CanvasFillOrStrokeStyle::Color(rgba);
                     self.ipc_renderer
@@ -985,14 +985,14 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
                         .unwrap()
                 }
             }
-            StringOrCanvasGradientOrCanvasPattern::eCanvasGradient(gradient) => {
+            StringOrCanvasGradientOrCanvasPattern::CanvasGradient(gradient) => {
                 self.state.borrow_mut().fill_style =
                     CanvasFillOrStrokeStyle::Gradient(JS::from_rooted(&gradient));
                 let msg = CanvasMsg::Canvas2d(
                     Canvas2dMsg::SetFillStyle(gradient.to_fill_or_stroke_style()));
                 self.ipc_renderer.send(msg).unwrap();
             }
-            StringOrCanvasGradientOrCanvasPattern::eCanvasPattern(pattern) => {
+            StringOrCanvasGradientOrCanvasPattern::CanvasPattern(pattern) => {
                 self.state.borrow_mut().fill_style =
                     CanvasFillOrStrokeStyle::Pattern(JS::from_rooted(&pattern));
                 let msg = CanvasMsg::Canvas2d(
@@ -1156,18 +1156,18 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
                      mut repetition: DOMString)
                      -> Fallible<Root<CanvasPattern>> {
         let (image_data, image_size) = match image {
-            HTMLImageElementOrHTMLCanvasElementOrCanvasRenderingContext2D::eHTMLImageElement(ref image) => {
+            HTMLImageElementOrHTMLCanvasElementOrCanvasRenderingContext2D::HTMLImageElement(ref image) => {
                 // https://html.spec.whatwg.org/multipage/#img-error
                 // If the image argument is an HTMLImageElement object that is in the broken state,
                 // then throw an InvalidStateError exception
                 try!(self.fetch_image_data(&image.r()).ok_or(Error::InvalidState))
             },
-            HTMLImageElementOrHTMLCanvasElementOrCanvasRenderingContext2D::eHTMLCanvasElement(ref canvas) => {
+            HTMLImageElementOrHTMLCanvasElementOrCanvasRenderingContext2D::HTMLCanvasElement(ref canvas) => {
                 let _ = canvas.get_or_init_2d_context();
 
                 try!(canvas.fetch_all_data().ok_or(Error::InvalidState))
             },
-            HTMLImageElementOrHTMLCanvasElementOrCanvasRenderingContext2D::eCanvasRenderingContext2D(ref context) => {
+            HTMLImageElementOrHTMLCanvasElementOrCanvasRenderingContext2D::CanvasRenderingContext2D(ref context) => {
                 let canvas = context.Canvas();
                 let _ = canvas.get_or_init_2d_context();
 
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
index b5672319837..38306619fc4 100644
--- a/components/script/dom/document.rs
+++ b/components/script/dom/document.rs
@@ -1060,17 +1060,17 @@ impl Document {
                                        -> Fallible<Root<Node>> {
         if nodes.len() == 1 {
             Ok(match nodes.pop().unwrap() {
-                NodeOrString::eNode(node) => node,
-                NodeOrString::eString(string) => Root::upcast(self.CreateTextNode(string)),
+                NodeOrString::Node(node) => node,
+                NodeOrString::String(string) => Root::upcast(self.CreateTextNode(string)),
             })
         } else {
             let fragment = Root::upcast::<Node>(self.CreateDocumentFragment());
             for node in nodes {
                 match node {
-                    NodeOrString::eNode(node) => {
+                    NodeOrString::Node(node) => {
                         try!(fragment.AppendChild(node.r()));
                     },
-                    NodeOrString::eString(string) => {
+                    NodeOrString::String(string) => {
                         let node = Root::upcast::<Node>(self.CreateTextNode(string));
                         // No try!() here because appending a text node
                         // should not fail.
diff --git a/components/script/dom/eventtarget.rs b/components/script/dom/eventtarget.rs
index 91afac1bf1c..38f737788ec 100644
--- a/components/script/dom/eventtarget.rs
+++ b/components/script/dom/eventtarget.rs
@@ -127,7 +127,7 @@ impl EventListenerType {
                             let cx = global.r().get_cx();
                             let error = RootedValue::new(cx, event.Error(cx));
                             let _ = handler.Call_(object,
-                                                  EventOrString::eString(event.Message()),
+                                                  EventOrString::String(event.Message()),
                                                   Some(event.Filename()),
                                                   Some(event.Lineno()),
                                                   Some(event.Colno()),
@@ -136,7 +136,7 @@ impl EventListenerType {
                             return;
                         }
 
-                        let _ = handler.Call_(object, EventOrString::eEvent(Root::from_ref(event)),
+                        let _ = handler.Call_(object, EventOrString::Event(Root::from_ref(event)),
                                               None, None, None, None, exception_handle);
                     }
 
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));
     }
diff --git a/components/script/dom/htmlcanvaselement.rs b/components/script/dom/htmlcanvaselement.rs
index e136638338d..3ab122d2bf7 100644
--- a/components/script/dom/htmlcanvaselement.rs
+++ b/components/script/dom/htmlcanvaselement.rs
@@ -236,11 +236,11 @@ impl HTMLCanvasElementMethods for HTMLCanvasElement {
         match &*id {
             "2d" => {
                 self.get_or_init_2d_context()
-                    .map(CanvasRenderingContext2DOrWebGLRenderingContext::eCanvasRenderingContext2D)
+                    .map(CanvasRenderingContext2DOrWebGLRenderingContext::CanvasRenderingContext2D)
             }
             "webgl" | "experimental-webgl" => {
                 self.get_or_init_webgl_context(cx, attributes.get(0).cloned())
-                    .map(CanvasRenderingContext2DOrWebGLRenderingContext::eWebGLRenderingContext)
+                    .map(CanvasRenderingContext2DOrWebGLRenderingContext::WebGLRenderingContext)
             }
             _ => None
         }
diff --git a/components/script/dom/htmlformcontrolscollection.rs b/components/script/dom/htmlformcontrolscollection.rs
index 734878d75c4..3de32f948c3 100644
--- a/components/script/dom/htmlformcontrolscollection.rs
+++ b/components/script/dom/htmlformcontrolscollection.rs
@@ -5,7 +5,7 @@
 use dom::bindings::codegen::Bindings::HTMLCollectionBinding::HTMLCollectionMethods;
 use dom::bindings::codegen::Bindings::HTMLFormControlsCollectionBinding;
 use dom::bindings::codegen::Bindings::HTMLFormControlsCollectionBinding::HTMLFormControlsCollectionMethods;
-use dom::bindings::codegen::UnionTypes::RadioNodeListOrElement::{self, eElement, eRadioNodeList};
+use dom::bindings::codegen::UnionTypes::RadioNodeListOrElement;
 use dom::bindings::global::GlobalRef;
 use dom::bindings::inheritance::Castable;
 use dom::bindings::js::Root;
@@ -62,7 +62,7 @@ impl HTMLFormControlsCollectionMethods for HTMLFormControlsCollection {
             let mut peekable = filter_map.peekable();
             // Step 2
             if peekable.peek().is_none() {
-                Some(eElement(elem))
+                Some(RadioNodeListOrElement::Element(elem))
             } else {
                 // Step 4-5
                 let once = iter::once(Root::upcast::<Node>(elem));
@@ -70,7 +70,7 @@ impl HTMLFormControlsCollectionMethods for HTMLFormControlsCollection {
                 let global = self.global();
                 let global = global.r();
                 let window = global.as_window();
-                Some(eRadioNodeList(RadioNodeList::new_simple_list(window, list)))
+                Some(RadioNodeListOrElement::RadioNodeList(RadioNodeList::new_simple_list(window, list)))
             }
         // Step 3
         } else { None }
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
index a50aad1a78e..aef4192dc6e 100644
--- a/components/script/dom/node.rs
+++ b/components/script/dom/node.rs
@@ -866,7 +866,7 @@ fn first_node_not_in<I>(mut nodes: I, not_in: &[NodeOrString]) -> Option<Root<No
     nodes.find(|node| {
         not_in.iter().all(|n| {
             match *n {
-                NodeOrString::eNode(ref n) => n != node,
+                NodeOrString::Node(ref n) => n != node,
                 _ => true,
             }
         })
diff --git a/components/script/dom/testbinding.rs b/components/script/dom/testbinding.rs
index 31fa20f0409..24ae45bcadc 100644
--- a/components/script/dom/testbinding.rs
+++ b/components/script/dom/testbinding.rs
@@ -90,12 +90,12 @@ impl TestBindingMethods for TestBinding {
         Blob::new(self.global().r(), Vec::new(), "")
     }
     fn SetInterfaceAttribute(&self, _: &Blob) {}
-    fn UnionAttribute(&self) -> HTMLElementOrLong { HTMLElementOrLong::eLong(0) }
+    fn UnionAttribute(&self) -> HTMLElementOrLong { HTMLElementOrLong::Long(0) }
     fn SetUnionAttribute(&self, _: HTMLElementOrLong) {}
-    fn Union2Attribute(&self) -> EventOrString { EventOrString::eString(DOMString::new()) }
+    fn Union2Attribute(&self) -> EventOrString { EventOrString::String(DOMString::new()) }
     fn SetUnion2Attribute(&self, _: EventOrString) {}
     fn Union3Attribute(&self) -> EventOrUSVString {
-        EventOrUSVString::eUSVString(USVString("".to_owned()))
+        EventOrUSVString::USVString(USVString("".to_owned()))
     }
     fn SetUnion3Attribute(&self, _: EventOrUSVString) {}
     fn ArrayAttribute(&self, _: *mut JSContext) -> *mut JSObject { NullValue().to_object_or_null() }
@@ -157,11 +157,11 @@ impl TestBindingMethods for TestBinding {
     fn GetObjectAttributeNullable(&self, _: *mut JSContext) -> *mut JSObject { ptr::null_mut() }
     fn SetObjectAttributeNullable(&self, _: *mut JSContext, _: *mut JSObject) {}
     fn GetUnionAttributeNullable(&self) -> Option<HTMLElementOrLong> {
-        Some(HTMLElementOrLong::eLong(0))
+        Some(HTMLElementOrLong::Long(0))
     }
     fn SetUnionAttributeNullable(&self, _: Option<HTMLElementOrLong>) {}
     fn GetUnion2AttributeNullable(&self) -> Option<EventOrString> {
-        Some(EventOrString::eString(DOMString::new()))
+        Some(EventOrString::String(DOMString::new()))
     }
     fn SetUnion2AttributeNullable(&self, _: Option<EventOrString>) {}
     fn BinaryRenamedMethod(&self) -> () {}
@@ -188,11 +188,11 @@ impl TestBindingMethods for TestBinding {
     }
     fn ReceiveAny(&self, _: *mut JSContext) -> JSVal { NullValue() }
     fn ReceiveObject(&self, _: *mut JSContext) -> *mut JSObject { panic!() }
-    fn ReceiveUnion(&self) -> HTMLElementOrLong { HTMLElementOrLong::eLong(0) }
-    fn ReceiveUnion2(&self) -> EventOrString { EventOrString::eString(DOMString::new()) }
-    fn ReceiveUnion3(&self) -> StringOrLongSequence { StringOrLongSequence::eLongSequence(vec![]) }
-    fn ReceiveUnion4(&self) -> StringOrStringSequence { StringOrStringSequence::eStringSequence(vec![]) }
-    fn ReceiveUnion5(&self) -> BlobOrBlobSequence { BlobOrBlobSequence::eBlobSequence(vec![]) }
+    fn ReceiveUnion(&self) -> HTMLElementOrLong { HTMLElementOrLong::Long(0) }
+    fn ReceiveUnion2(&self) -> EventOrString { EventOrString::String(DOMString::new()) }
+    fn ReceiveUnion3(&self) -> StringOrLongSequence { StringOrLongSequence::LongSequence(vec![]) }
+    fn ReceiveUnion4(&self) -> StringOrStringSequence { StringOrStringSequence::StringSequence(vec![]) }
+    fn ReceiveUnion5(&self) -> BlobOrBlobSequence { BlobOrBlobSequence::BlobSequence(vec![]) }
     fn ReceiveSequence(&self) -> Vec<i32> { vec![1] }
     fn ReceiveInterfaceSequence(&self) -> Vec<Root<Blob>> {
         vec![Blob::new(self.global().r(), Vec::new(), "")]
@@ -220,13 +220,13 @@ impl TestBindingMethods for TestBinding {
     }
     fn ReceiveNullableObject(&self, _: *mut JSContext) -> *mut JSObject { ptr::null_mut() }
     fn ReceiveNullableUnion(&self) -> Option<HTMLElementOrLong> {
-        Some(HTMLElementOrLong::eLong(0))
+        Some(HTMLElementOrLong::Long(0))
     }
     fn ReceiveNullableUnion2(&self) -> Option<EventOrString> {
-        Some(EventOrString::eString(DOMString::new()))
+        Some(EventOrString::String(DOMString::new()))
     }
     fn ReceiveNullableUnion3(&self) -> Option<StringOrLongSequence> {
-        Some(StringOrLongSequence::eString(DOMString::new()))
+        Some(StringOrLongSequence::String(DOMString::new()))
     }
     fn ReceiveNullableSequence(&self) -> Option<Vec<i32>> { Some(vec![1]) }
 
diff --git a/components/script/dom/urlsearchparams.rs b/components/script/dom/urlsearchparams.rs
index 446b0681a62..27df100aac1 100644
--- a/components/script/dom/urlsearchparams.rs
+++ b/components/script/dom/urlsearchparams.rs
@@ -6,7 +6,6 @@ use dom::bindings::cell::DOMRefCell;
 use dom::bindings::codegen::Bindings::URLSearchParamsBinding;
 use dom::bindings::codegen::Bindings::URLSearchParamsBinding::URLSearchParamsMethods;
 use dom::bindings::codegen::UnionTypes::USVStringOrURLSearchParams;
-use dom::bindings::codegen::UnionTypes::USVStringOrURLSearchParams::{eUSVString, eURLSearchParams};
 use dom::bindings::error::Fallible;
 use dom::bindings::global::GlobalRef;
 use dom::bindings::js::Root;
@@ -43,11 +42,11 @@ impl URLSearchParams {
         // Step 1.
         let query = URLSearchParams::new(global);
         match init {
-            Some(eUSVString(init)) => {
+            Some(USVStringOrURLSearchParams::USVString(init)) => {
                 // Step 2.
                 *query.list.borrow_mut() = parse(init.0.as_bytes());
             },
-            Some(eURLSearchParams(init)) => {
+            Some(USVStringOrURLSearchParams::URLSearchParams(init)) => {
                 // Step 3.
                 *query.list.borrow_mut() = init.list.borrow().clone();
             },
diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs
index 51d9f3a12c8..ff2d6968e9a 100644
--- a/components/script/dom/webglrenderingcontext.rs
+++ b/components/script/dom/webglrenderingcontext.rs
@@ -1124,11 +1124,11 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
         };
 
         let (pixels, size) = match source {
-            ImageDataOrHTMLImageElementOrHTMLCanvasElementOrHTMLVideoElement::eImageData(image_data) => {
+            ImageDataOrHTMLImageElementOrHTMLCanvasElementOrHTMLVideoElement::ImageData(image_data) => {
                 let global = self.global();
                 (image_data.get_data_array(&global.r()), image_data.get_size())
             },
-            ImageDataOrHTMLImageElementOrHTMLCanvasElementOrHTMLVideoElement::eHTMLImageElement(image) => {
+            ImageDataOrHTMLImageElementOrHTMLCanvasElementOrHTMLVideoElement::HTMLImageElement(image) => {
                 let img_url = match image.get_url() {
                     Some(url) => url,
                     None => return,
@@ -1157,7 +1157,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
             },
             // TODO(ecoal95): Getting canvas data is implemented in CanvasRenderingContext2D, but
             // we need to refactor it moving it to `HTMLCanvasElement` and supporting WebGLContext
-            ImageDataOrHTMLImageElementOrHTMLCanvasElementOrHTMLVideoElement::eHTMLCanvasElement(canvas) => {
+            ImageDataOrHTMLImageElementOrHTMLCanvasElementOrHTMLVideoElement::HTMLCanvasElement(canvas) => {
                 let canvas = canvas.r();
                 if let Some((mut data, size)) = canvas.fetch_all_data() {
                     byte_swap(&mut data);
@@ -1166,7 +1166,7 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
                     return
                 }
             },
-            ImageDataOrHTMLImageElementOrHTMLCanvasElementOrHTMLVideoElement::eHTMLVideoElement(_rooted_video)
+            ImageDataOrHTMLImageElementOrHTMLCanvasElementOrHTMLVideoElement::HTMLVideoElement(_rooted_video)
                 => unimplemented!(),
         };
 
diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs
index c8544698ecb..e3f6de6b49a 100644
--- a/components/script/dom/websocket.rs
+++ b/components/script/dom/websocket.rs
@@ -8,7 +8,7 @@ use dom::bindings::codegen::Bindings::EventHandlerBinding::EventHandlerNonNull;
 use dom::bindings::codegen::Bindings::LocationBinding::LocationMethods;
 use dom::bindings::codegen::Bindings::WebSocketBinding;
 use dom::bindings::codegen::Bindings::WebSocketBinding::{BinaryType, WebSocketMethods};
-use dom::bindings::codegen::UnionTypes::StringOrStringSequence::{self, eString, eStringSequence};
+use dom::bindings::codegen::UnionTypes::StringOrStringSequence;
 use dom::bindings::conversions::{ToJSValConvertible};
 use dom::bindings::error::{Error, Fallible};
 use dom::bindings::global::GlobalRef;
@@ -210,8 +210,8 @@ impl WebSocket {
 
         // Step 4.
         let protocols = match protocols {
-            Some(eString(string)) => vec![String::from(string)],
-            Some(eStringSequence(sequence)) => {
+            Some(StringOrStringSequence::String(string)) => vec![String::from(string)],
+            Some(StringOrStringSequence::StringSequence(sequence)) => {
                 sequence.into_iter().map(String::from).collect()
             },
             _ => Vec::new(),
diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs
index 93e46d14510..9b33c4a3221 100644
--- a/components/script/dom/xmlhttprequest.rs
+++ b/components/script/dom/xmlhttprequest.rs
@@ -14,7 +14,6 @@ use dom::bindings::codegen::Bindings::XMLHttpRequestBinding::XMLHttpRequestMetho
 use dom::bindings::codegen::Bindings::XMLHttpRequestBinding::XMLHttpRequestResponseType;
 use dom::bindings::codegen::Bindings::XMLHttpRequestBinding::XMLHttpRequestResponseType::{Json, Text, _empty};
 use dom::bindings::codegen::UnionTypes::BlobOrStringOrURLSearchParams;
-use dom::bindings::codegen::UnionTypes::BlobOrStringOrURLSearchParams::{eBlob, eString, eURLSearchParams};
 use dom::bindings::conversions::{ToJSValConvertible};
 use dom::bindings::error::{Error, ErrorResult, Fallible};
 use dom::bindings::global::{GlobalRef, GlobalRoot};
@@ -1240,17 +1239,17 @@ impl Extractable for SendParam {
     // https://fetch.spec.whatwg.org/#concept-bodyinit-extract
     fn extract(&self) -> (Vec<u8>, Option<DOMString>) {
         match *self {
-            eString(ref s) => {
+            BlobOrStringOrURLSearchParams::String(ref s) => {
                 let encoding = UTF_8 as EncodingRef;
                 (encoding.encode(s, EncoderTrap::Replace).unwrap(),
                     Some(DOMString::from("text/plain;charset=UTF-8")))
             },
-            eURLSearchParams(ref usp) => {
+            BlobOrStringOrURLSearchParams::URLSearchParams(ref usp) => {
                 // Default encoding is UTF-8.
                 (usp.serialize(None).into_bytes(),
                     Some(DOMString::from("application/x-www-form-urlencoded;charset=UTF-8")))
             },
-            eBlob(ref b) => {
+            BlobOrStringOrURLSearchParams::Blob(ref b) => {
                 let data = b.get_data();
                 let content_type = if b.Type().as_ref().is_empty() {
                     None