diff --git a/components/script/dom/htmlbuttonelement.rs b/components/script/dom/htmlbuttonelement.rs index f12666e41d2..95b85d0da8d 100644 --- a/components/script/dom/htmlbuttonelement.rs +++ b/components/script/dom/htmlbuttonelement.rs @@ -83,7 +83,7 @@ impl HTMLButtonElementMethods for HTMLButtonElement { } // https://html.spec.whatwg.org/multipage/#dom-button-type - make_enumerated_getter!(Type, "type", "submit", ("reset") | ("button") | ("menu")); + make_enumerated_getter!(Type, "type", "submit", "reset" | "button" | "menu"); // https://html.spec.whatwg.org/multipage/#dom-button-type make_setter!(SetType, "type"); @@ -98,13 +98,13 @@ impl HTMLButtonElementMethods for HTMLButtonElement { make_enumerated_getter!(FormEnctype, "formenctype", "application/x-www-form-urlencoded", - ("text/plain") | ("multipart/form-data")); + "text/plain" | "multipart/form-data"); // https://html.spec.whatwg.org/multipage/#dom-fs-formenctype make_setter!(SetFormEnctype, "formenctype"); // https://html.spec.whatwg.org/multipage/#dom-fs-formmethod - make_enumerated_getter!(FormMethod, "formmethod", "get", ("post") | ("dialog")); + make_enumerated_getter!(FormMethod, "formmethod", "get", "post" | "dialog"); // https://html.spec.whatwg.org/multipage/#dom-fs-formmethod make_setter!(SetFormMethod, "formmethod"); diff --git a/components/script/dom/htmlformelement.rs b/components/script/dom/htmlformelement.rs index 2bd14caeb67..090aa8553bf 100644 --- a/components/script/dom/htmlformelement.rs +++ b/components/script/dom/htmlformelement.rs @@ -104,7 +104,7 @@ impl HTMLFormElementMethods for HTMLFormElement { make_setter!(SetAction, "action"); // https://html.spec.whatwg.org/multipage/#dom-form-autocomplete - make_enumerated_getter!(Autocomplete, "autocomplete", "on", ("off")); + make_enumerated_getter!(Autocomplete, "autocomplete", "on", "off"); // https://html.spec.whatwg.org/multipage/#dom-form-autocomplete make_setter!(SetAutocomplete, "autocomplete"); @@ -113,7 +113,7 @@ impl HTMLFormElementMethods for HTMLFormElement { make_enumerated_getter!(Enctype, "enctype", "application/x-www-form-urlencoded", - ("text/plain") | ("multipart/form-data")); + "text/plain" | "multipart/form-data"); // https://html.spec.whatwg.org/multipage/#dom-fs-enctype make_setter!(SetEnctype, "enctype"); @@ -129,7 +129,7 @@ impl HTMLFormElementMethods for HTMLFormElement { } // https://html.spec.whatwg.org/multipage/#dom-fs-method - make_enumerated_getter!(Method, "method", "get", ("post") | ("dialog")); + make_enumerated_getter!(Method, "method", "get", "post" | "dialog"); // https://html.spec.whatwg.org/multipage/#dom-fs-method make_setter!(SetMethod, "method"); diff --git a/components/script/dom/htmlimageelement.rs b/components/script/dom/htmlimageelement.rs index daa53917cd5..911f305e9f9 100644 --- a/components/script/dom/htmlimageelement.rs +++ b/components/script/dom/htmlimageelement.rs @@ -297,7 +297,7 @@ impl HTMLImageElementMethods for HTMLImageElement { make_setter!(SetSrc, "src"); // https://html.spec.whatwg.org/multipage/#dom-img-crossOrigin - make_enumerated_getter!(CrossOrigin, "crossorigin", "anonymous", ("use-credentials")); + make_enumerated_getter!(CrossOrigin, "crossorigin", "anonymous", "use-credentials"); // https://html.spec.whatwg.org/multipage/#dom-img-crossOrigin make_setter!(SetCrossOrigin, "crossorigin"); diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs index 4294a7952ab..049d765b831 100644 --- a/components/script/dom/htmlinputelement.rs +++ b/components/script/dom/htmlinputelement.rs @@ -354,13 +354,13 @@ impl HTMLInputElementMethods for HTMLInputElement { make_enumerated_getter!(Type, "type", "text", - ("hidden") | ("search") | ("tel") | - ("url") | ("email") | ("password") | - ("datetime") | ("date") | ("month") | - ("week") | ("time") | ("datetime-local") | - ("number") | ("range") | ("color") | - ("checkbox") | ("radio") | ("file") | - ("submit") | ("image") | ("reset") | ("button")); + "hidden" | "search" | "tel" | + "url" | "email" | "password" | + "datetime" | "date" | "month" | + "week" | "time" | "datetime-local" | + "number" | "range" | "color" | + "checkbox" | "radio" | "file" | + "submit" | "image" | "reset" | "button"); // https://html.spec.whatwg.org/multipage/#dom-input-type make_atomic_setter!(SetType, "type"); @@ -453,13 +453,13 @@ impl HTMLInputElementMethods for HTMLInputElement { make_enumerated_getter!(FormEnctype, "formenctype", "application/x-www-form-urlencoded", - ("text/plain") | ("multipart/form-data")); + "text/plain" | "multipart/form-data"); // https://html.spec.whatwg.org/multipage/#dom-input-formenctype make_setter!(SetFormEnctype, "formenctype"); // https://html.spec.whatwg.org/multipage/#dom-input-formmethod - make_enumerated_getter!(FormMethod, "formmethod", "get", ("post") | ("dialog")); + make_enumerated_getter!(FormMethod, "formmethod", "get", "post" | "dialog"); // https://html.spec.whatwg.org/multipage/#dom-input-formmethod make_setter!(SetFormMethod, "formmethod"); diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs index 826d879ab56..203763d3e15 100644 --- a/components/script/dom/htmlmediaelement.rs +++ b/components/script/dom/htmlmediaelement.rs @@ -664,7 +664,7 @@ impl HTMLMediaElementMethods for HTMLMediaElement { // https://html.spec.whatwg.org/multipage/#attr-media-preload // Missing value default is user-agent defined. - make_enumerated_getter!(Preload, "preload", "", ("none") | ("metadata") | ("auto")); + make_enumerated_getter!(Preload, "preload", "", "none" | "metadata" | "auto"); // https://html.spec.whatwg.org/multipage/#attr-media-preload make_setter!(SetPreload, "preload"); diff --git a/components/script/dom/macros.rs b/components/script/dom/macros.rs index 5935f02cde2..2fa6a87b980 100644 --- a/components/script/dom/macros.rs +++ b/components/script/dom/macros.rs @@ -145,7 +145,7 @@ macro_rules! make_string_or_document_url_getter( #[macro_export] macro_rules! make_enumerated_getter( - ( $attr:ident, $htmlname:tt, $default:expr, $(($choices: pat))|+) => ( + ( $attr:ident, $htmlname:tt, $default:expr, $($choices: pat)|+) => ( fn $attr(&self) -> DOMString { use dom::bindings::inheritance::Castable; use dom::element::Element;