From 300004f3e9d3759e1d0baf3e2379b8a9d9eeff80 Mon Sep 17 00:00:00 2001 From: Martin Robinson Date: Thu, 8 May 2014 13:27:59 -0700 Subject: [PATCH] Use == instead of match for tests against a single enum value The performance of using == should now equal that of match, so many identity methods can be simplified to a single line. Fixes #1596. --- src/components/script/dom/comment.rs | 5 +---- src/components/script/dom/document.rs | 5 +---- src/components/script/dom/documentfragment.rs | 5 +---- src/components/script/dom/documenttype.rs | 5 +---- .../script/dom/htmlanchorelement.rs | 5 +---- .../script/dom/htmlappletelement.rs | 5 +---- src/components/script/dom/htmlareaelement.rs | 5 +---- src/components/script/dom/htmlaudioelement.rs | 5 +---- src/components/script/dom/htmlbaseelement.rs | 5 +---- src/components/script/dom/htmlbodyelement.rs | 5 +---- src/components/script/dom/htmlbrelement.rs | 5 +---- .../script/dom/htmlbuttonelement.rs | 5 +---- .../script/dom/htmlcanvaselement.rs | 5 +---- src/components/script/dom/htmldataelement.rs | 5 +---- .../script/dom/htmldatalistelement.rs | 5 +---- .../script/dom/htmldirectoryelement.rs | 5 +---- src/components/script/dom/htmldivelement.rs | 5 +---- src/components/script/dom/htmldlistelement.rs | 5 +---- src/components/script/dom/htmlembedelement.rs | 5 +---- .../script/dom/htmlfieldsetelement.rs | 5 +---- src/components/script/dom/htmlfontelement.rs | 5 +---- src/components/script/dom/htmlformelement.rs | 5 +---- src/components/script/dom/htmlframeelement.rs | 5 +---- .../script/dom/htmlframesetelement.rs | 5 +---- src/components/script/dom/htmlheadelement.rs | 5 +---- .../script/dom/htmlheadingelement.rs | 5 +---- src/components/script/dom/htmlhrelement.rs | 5 +---- src/components/script/dom/htmlhtmlelement.rs | 5 +---- .../script/dom/htmliframeelement.rs | 5 +---- src/components/script/dom/htmlimageelement.rs | 5 +---- src/components/script/dom/htmlinputelement.rs | 5 +---- src/components/script/dom/htmllabelelement.rs | 5 +---- .../script/dom/htmllegendelement.rs | 5 +---- src/components/script/dom/htmllielement.rs | 5 +---- src/components/script/dom/htmllinkelement.rs | 5 +---- src/components/script/dom/htmlmainelement.rs | 5 +---- src/components/script/dom/htmlmapelement.rs | 5 +---- src/components/script/dom/htmlmetaelement.rs | 5 +---- src/components/script/dom/htmlmeterelement.rs | 5 +---- src/components/script/dom/htmlmodelement.rs | 5 +---- .../script/dom/htmlobjectelement.rs | 5 +---- src/components/script/dom/htmlolistelement.rs | 5 +---- .../script/dom/htmloptgroupelement.rs | 5 +---- .../script/dom/htmloptionelement.rs | 5 +---- .../script/dom/htmloutputelement.rs | 5 +---- .../script/dom/htmlparagraphelement.rs | 5 +---- src/components/script/dom/htmlparamelement.rs | 5 +---- src/components/script/dom/htmlpreelement.rs | 5 +---- .../script/dom/htmlprogresselement.rs | 5 +---- src/components/script/dom/htmlquoteelement.rs | 5 +---- .../script/dom/htmlscriptelement.rs | 5 +---- .../script/dom/htmlselectelement.rs | 5 +---- .../script/dom/htmlsourceelement.rs | 5 +---- src/components/script/dom/htmlspanelement.rs | 5 +---- src/components/script/dom/htmlstyleelement.rs | 5 +---- .../script/dom/htmltablecaptionelement.rs | 5 +---- .../script/dom/htmltablecolelement.rs | 5 +---- .../script/dom/htmltabledatacellelement.rs | 5 +---- src/components/script/dom/htmltableelement.rs | 5 +---- .../script/dom/htmltableheadercellelement.rs | 5 +---- .../script/dom/htmltablerowelement.rs | 5 +---- .../script/dom/htmltablesectionelement.rs | 5 +---- .../script/dom/htmltemplateelement.rs | 5 +---- .../script/dom/htmltextareaelement.rs | 5 +---- src/components/script/dom/htmltimeelement.rs | 5 +---- src/components/script/dom/htmltitleelement.rs | 5 +---- src/components/script/dom/htmltrackelement.rs | 5 +---- src/components/script/dom/htmlulistelement.rs | 5 +---- .../script/dom/htmlunknownelement.rs | 5 +---- src/components/script/dom/htmlvideoelement.rs | 5 +---- src/components/script/dom/node.rs | 22 ++++--------------- .../script/dom/processinginstruction.rs | 5 +---- src/components/script/dom/text.rs | 5 +---- src/components/script/dom/xmlhttprequest.rs | 7 ++---- .../script/dom/xmlhttprequestupload.rs | 7 ++---- 75 files changed, 80 insertions(+), 316 deletions(-) diff --git a/src/components/script/dom/comment.rs b/src/components/script/dom/comment.rs index 0e314324e576..896cfe47560c 100644 --- a/src/components/script/dom/comment.rs +++ b/src/components/script/dom/comment.rs @@ -21,10 +21,7 @@ pub struct Comment { impl CommentDerived for EventTarget { fn is_comment(&self) -> bool { - match self.type_id { - NodeTargetTypeId(CommentNodeTypeId) => true, - _ => false - } + self.type_id == NodeTargetTypeId(CommentNodeTypeId) } } diff --git a/src/components/script/dom/document.rs b/src/components/script/dom/document.rs index afbf58cbbdc3..c10c791d8289 100644 --- a/src/components/script/dom/document.rs +++ b/src/components/script/dom/document.rs @@ -69,10 +69,7 @@ pub struct Document { impl DocumentDerived for EventTarget { fn is_document(&self) -> bool { - match self.type_id { - NodeTargetTypeId(DocumentNodeTypeId) => true, - _ => false - } + self.type_id == NodeTargetTypeId(DocumentNodeTypeId) } } diff --git a/src/components/script/dom/documentfragment.rs b/src/components/script/dom/documentfragment.rs index 25f2c3c1d69a..07efa58e1665 100644 --- a/src/components/script/dom/documentfragment.rs +++ b/src/components/script/dom/documentfragment.rs @@ -19,10 +19,7 @@ pub struct DocumentFragment { impl DocumentFragmentDerived for EventTarget { fn is_documentfragment(&self) -> bool { - match self.type_id { - NodeTargetTypeId(DocumentFragmentNodeTypeId) => true, - _ => false - } + self.type_id == NodeTargetTypeId(DocumentFragmentNodeTypeId) } } diff --git a/src/components/script/dom/documenttype.rs b/src/components/script/dom/documenttype.rs index 1a3bf0760af4..98c7a5e1f861 100644 --- a/src/components/script/dom/documenttype.rs +++ b/src/components/script/dom/documenttype.rs @@ -21,10 +21,7 @@ pub struct DocumentType { impl DocumentTypeDerived for EventTarget { fn is_documenttype(&self) -> bool { - match self.type_id { - NodeTargetTypeId(DoctypeNodeTypeId) => true, - _ => false - } + self.type_id == NodeTargetTypeId(DoctypeNodeTypeId) } } diff --git a/src/components/script/dom/htmlanchorelement.rs b/src/components/script/dom/htmlanchorelement.rs index 69fda3aa73d5..b2ee9c542f1c 100644 --- a/src/components/script/dom/htmlanchorelement.rs +++ b/src/components/script/dom/htmlanchorelement.rs @@ -20,10 +20,7 @@ pub struct HTMLAnchorElement { impl HTMLAnchorElementDerived for EventTarget { fn is_htmlanchorelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLAnchorElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLAnchorElementTypeId)) } } diff --git a/src/components/script/dom/htmlappletelement.rs b/src/components/script/dom/htmlappletelement.rs index 178a644e96c2..d2867a2dda90 100644 --- a/src/components/script/dom/htmlappletelement.rs +++ b/src/components/script/dom/htmlappletelement.rs @@ -20,10 +20,7 @@ pub struct HTMLAppletElement { impl HTMLAppletElementDerived for EventTarget { fn is_htmlappletelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLAppletElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLAppletElementTypeId)) } } diff --git a/src/components/script/dom/htmlareaelement.rs b/src/components/script/dom/htmlareaelement.rs index c6fd8420fbf0..ff67ad699630 100644 --- a/src/components/script/dom/htmlareaelement.rs +++ b/src/components/script/dom/htmlareaelement.rs @@ -20,10 +20,7 @@ pub struct HTMLAreaElement { impl HTMLAreaElementDerived for EventTarget { fn is_htmlareaelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLAreaElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLAreaElementTypeId)) } } diff --git a/src/components/script/dom/htmlaudioelement.rs b/src/components/script/dom/htmlaudioelement.rs index 9cc697454d12..b95a39822a79 100644 --- a/src/components/script/dom/htmlaudioelement.rs +++ b/src/components/script/dom/htmlaudioelement.rs @@ -19,10 +19,7 @@ pub struct HTMLAudioElement { impl HTMLAudioElementDerived for EventTarget { fn is_htmlaudioelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLAudioElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLAudioElementTypeId)) } } diff --git a/src/components/script/dom/htmlbaseelement.rs b/src/components/script/dom/htmlbaseelement.rs index 3986e5c9beb7..8b035fca1253 100644 --- a/src/components/script/dom/htmlbaseelement.rs +++ b/src/components/script/dom/htmlbaseelement.rs @@ -20,10 +20,7 @@ pub struct HTMLBaseElement { impl HTMLBaseElementDerived for EventTarget { fn is_htmlbaseelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLBaseElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLBaseElementTypeId)) } } diff --git a/src/components/script/dom/htmlbodyelement.rs b/src/components/script/dom/htmlbodyelement.rs index 3a4b9440ff47..eb8f70be9c21 100644 --- a/src/components/script/dom/htmlbodyelement.rs +++ b/src/components/script/dom/htmlbodyelement.rs @@ -20,10 +20,7 @@ pub struct HTMLBodyElement { impl HTMLBodyElementDerived for EventTarget { fn is_htmlbodyelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLBodyElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLBodyElementTypeId)) } } diff --git a/src/components/script/dom/htmlbrelement.rs b/src/components/script/dom/htmlbrelement.rs index 9628e963397e..46e42c584c1b 100644 --- a/src/components/script/dom/htmlbrelement.rs +++ b/src/components/script/dom/htmlbrelement.rs @@ -20,10 +20,7 @@ pub struct HTMLBRElement { impl HTMLBRElementDerived for EventTarget { fn is_htmlbrelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLBRElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLBRElementTypeId)) } } diff --git a/src/components/script/dom/htmlbuttonelement.rs b/src/components/script/dom/htmlbuttonelement.rs index ebd7ad93191b..2034b8ba33ad 100644 --- a/src/components/script/dom/htmlbuttonelement.rs +++ b/src/components/script/dom/htmlbuttonelement.rs @@ -22,10 +22,7 @@ pub struct HTMLButtonElement { impl HTMLButtonElementDerived for EventTarget { fn is_htmlbuttonelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLButtonElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLButtonElementTypeId)) } } diff --git a/src/components/script/dom/htmlcanvaselement.rs b/src/components/script/dom/htmlcanvaselement.rs index 5970af52eb3c..4f7b185cbd18 100644 --- a/src/components/script/dom/htmlcanvaselement.rs +++ b/src/components/script/dom/htmlcanvaselement.rs @@ -20,10 +20,7 @@ pub struct HTMLCanvasElement { impl HTMLCanvasElementDerived for EventTarget { fn is_htmlcanvaselement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLCanvasElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLCanvasElementTypeId)) } } diff --git a/src/components/script/dom/htmldataelement.rs b/src/components/script/dom/htmldataelement.rs index 3f37c4564d37..4ed543aa6003 100644 --- a/src/components/script/dom/htmldataelement.rs +++ b/src/components/script/dom/htmldataelement.rs @@ -20,10 +20,7 @@ pub struct HTMLDataElement { impl HTMLDataElementDerived for EventTarget { fn is_htmldataelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLDataElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLDataElementTypeId)) } } diff --git a/src/components/script/dom/htmldatalistelement.rs b/src/components/script/dom/htmldatalistelement.rs index a180bd18f7c0..6c8b2739c19e 100644 --- a/src/components/script/dom/htmldatalistelement.rs +++ b/src/components/script/dom/htmldatalistelement.rs @@ -20,10 +20,7 @@ pub struct HTMLDataListElement { impl HTMLDataListElementDerived for EventTarget { fn is_htmldatalistelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLDataListElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLDataListElementTypeId)) } } diff --git a/src/components/script/dom/htmldirectoryelement.rs b/src/components/script/dom/htmldirectoryelement.rs index c16d0f01f346..f15deb2cdc4c 100644 --- a/src/components/script/dom/htmldirectoryelement.rs +++ b/src/components/script/dom/htmldirectoryelement.rs @@ -20,10 +20,7 @@ pub struct HTMLDirectoryElement { impl HTMLDirectoryElementDerived for EventTarget { fn is_htmldirectoryelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLDirectoryElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLDirectoryElementTypeId)) } } diff --git a/src/components/script/dom/htmldivelement.rs b/src/components/script/dom/htmldivelement.rs index 4c2fdfca5314..726efe362b14 100644 --- a/src/components/script/dom/htmldivelement.rs +++ b/src/components/script/dom/htmldivelement.rs @@ -20,10 +20,7 @@ pub struct HTMLDivElement { impl HTMLDivElementDerived for EventTarget { fn is_htmldivelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLDivElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLDivElementTypeId)) } } diff --git a/src/components/script/dom/htmldlistelement.rs b/src/components/script/dom/htmldlistelement.rs index 23ebc6d2c143..e6149ca91b6c 100644 --- a/src/components/script/dom/htmldlistelement.rs +++ b/src/components/script/dom/htmldlistelement.rs @@ -20,10 +20,7 @@ pub struct HTMLDListElement { impl HTMLDListElementDerived for EventTarget { fn is_htmldlistelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLDListElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLDListElementTypeId)) } } diff --git a/src/components/script/dom/htmlembedelement.rs b/src/components/script/dom/htmlembedelement.rs index 03e62445fcb9..5bc729595ea5 100644 --- a/src/components/script/dom/htmlembedelement.rs +++ b/src/components/script/dom/htmlembedelement.rs @@ -20,10 +20,7 @@ pub struct HTMLEmbedElement { impl HTMLEmbedElementDerived for EventTarget { fn is_htmlembedelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLEmbedElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLEmbedElementTypeId)) } } diff --git a/src/components/script/dom/htmlfieldsetelement.rs b/src/components/script/dom/htmlfieldsetelement.rs index 9d22ac25bdd0..bb6aecc13a0f 100644 --- a/src/components/script/dom/htmlfieldsetelement.rs +++ b/src/components/script/dom/htmlfieldsetelement.rs @@ -23,10 +23,7 @@ pub struct HTMLFieldSetElement { impl HTMLFieldSetElementDerived for EventTarget { fn is_htmlfieldsetelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLFieldSetElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLFieldSetElementTypeId)) } } diff --git a/src/components/script/dom/htmlfontelement.rs b/src/components/script/dom/htmlfontelement.rs index ba53fe53efa6..84a1d9d5f4ac 100644 --- a/src/components/script/dom/htmlfontelement.rs +++ b/src/components/script/dom/htmlfontelement.rs @@ -20,10 +20,7 @@ pub struct HTMLFontElement { impl HTMLFontElementDerived for EventTarget { fn is_htmlfontelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLFontElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLFontElementTypeId)) } } diff --git a/src/components/script/dom/htmlformelement.rs b/src/components/script/dom/htmlformelement.rs index 3588aa2ab008..305abb204f8c 100644 --- a/src/components/script/dom/htmlformelement.rs +++ b/src/components/script/dom/htmlformelement.rs @@ -21,10 +21,7 @@ pub struct HTMLFormElement { impl HTMLFormElementDerived for EventTarget { fn is_htmlformelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLFormElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLFormElementTypeId)) } } diff --git a/src/components/script/dom/htmlframeelement.rs b/src/components/script/dom/htmlframeelement.rs index 3322fd32cdce..deef5711c74c 100644 --- a/src/components/script/dom/htmlframeelement.rs +++ b/src/components/script/dom/htmlframeelement.rs @@ -21,10 +21,7 @@ pub struct HTMLFrameElement { impl HTMLFrameElementDerived for EventTarget { fn is_htmlframeelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLFrameElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLFrameElementTypeId)) } } diff --git a/src/components/script/dom/htmlframesetelement.rs b/src/components/script/dom/htmlframesetelement.rs index db20f2674fcc..47151c95ba93 100644 --- a/src/components/script/dom/htmlframesetelement.rs +++ b/src/components/script/dom/htmlframesetelement.rs @@ -20,10 +20,7 @@ pub struct HTMLFrameSetElement { impl HTMLFrameSetElementDerived for EventTarget { fn is_htmlframesetelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLFrameSetElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLFrameSetElementTypeId)) } } diff --git a/src/components/script/dom/htmlheadelement.rs b/src/components/script/dom/htmlheadelement.rs index 542312c9dfe6..3263131fe9a6 100644 --- a/src/components/script/dom/htmlheadelement.rs +++ b/src/components/script/dom/htmlheadelement.rs @@ -19,10 +19,7 @@ pub struct HTMLHeadElement { impl HTMLHeadElementDerived for EventTarget { fn is_htmlheadelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLHeadElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLHeadElementTypeId)) } } diff --git a/src/components/script/dom/htmlheadingelement.rs b/src/components/script/dom/htmlheadingelement.rs index 6057c5b7494a..a199421863f0 100644 --- a/src/components/script/dom/htmlheadingelement.rs +++ b/src/components/script/dom/htmlheadingelement.rs @@ -30,10 +30,7 @@ pub struct HTMLHeadingElement { impl HTMLHeadingElementDerived for EventTarget { fn is_htmlheadingelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLHeadingElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLHeadingElementTypeId)) } } diff --git a/src/components/script/dom/htmlhrelement.rs b/src/components/script/dom/htmlhrelement.rs index 827248bbbaa6..15bf08b0eee6 100644 --- a/src/components/script/dom/htmlhrelement.rs +++ b/src/components/script/dom/htmlhrelement.rs @@ -20,10 +20,7 @@ pub struct HTMLHRElement { impl HTMLHRElementDerived for EventTarget { fn is_htmlhrelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLHRElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLHRElementTypeId)) } } diff --git a/src/components/script/dom/htmlhtmlelement.rs b/src/components/script/dom/htmlhtmlelement.rs index a0820664c8f6..0b06135432bc 100644 --- a/src/components/script/dom/htmlhtmlelement.rs +++ b/src/components/script/dom/htmlhtmlelement.rs @@ -20,10 +20,7 @@ pub struct HTMLHtmlElement { impl HTMLHtmlElementDerived for EventTarget { fn is_htmlhtmlelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLHtmlElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLHtmlElementTypeId)) } } diff --git a/src/components/script/dom/htmliframeelement.rs b/src/components/script/dom/htmliframeelement.rs index 0591d39e3cd9..1c44fa33e4d0 100644 --- a/src/components/script/dom/htmliframeelement.rs +++ b/src/components/script/dom/htmliframeelement.rs @@ -41,10 +41,7 @@ pub struct HTMLIFrameElement { impl HTMLIFrameElementDerived for EventTarget { fn is_htmliframeelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLIFrameElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLIFrameElementTypeId)) } } diff --git a/src/components/script/dom/htmlimageelement.rs b/src/components/script/dom/htmlimageelement.rs index b1309c214e68..fa0dc117abda 100644 --- a/src/components/script/dom/htmlimageelement.rs +++ b/src/components/script/dom/htmlimageelement.rs @@ -28,10 +28,7 @@ pub struct HTMLImageElement { impl HTMLImageElementDerived for EventTarget { fn is_htmlimageelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLImageElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLImageElementTypeId)) } } diff --git a/src/components/script/dom/htmlinputelement.rs b/src/components/script/dom/htmlinputelement.rs index 7c6a2640b305..737be52132b2 100644 --- a/src/components/script/dom/htmlinputelement.rs +++ b/src/components/script/dom/htmlinputelement.rs @@ -20,10 +20,7 @@ pub struct HTMLInputElement { impl HTMLInputElementDerived for EventTarget { fn is_htmlinputelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLInputElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLInputElementTypeId)) } } diff --git a/src/components/script/dom/htmllabelelement.rs b/src/components/script/dom/htmllabelelement.rs index c4eee12897fe..433fff43c19e 100644 --- a/src/components/script/dom/htmllabelelement.rs +++ b/src/components/script/dom/htmllabelelement.rs @@ -19,10 +19,7 @@ pub struct HTMLLabelElement { impl HTMLLabelElementDerived for EventTarget { fn is_htmllabelelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLLabelElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLLabelElementTypeId)) } } diff --git a/src/components/script/dom/htmllegendelement.rs b/src/components/script/dom/htmllegendelement.rs index 833a3b59b2b3..b5552d5b2774 100644 --- a/src/components/script/dom/htmllegendelement.rs +++ b/src/components/script/dom/htmllegendelement.rs @@ -20,10 +20,7 @@ pub struct HTMLLegendElement { impl HTMLLegendElementDerived for EventTarget { fn is_htmllegendelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLLegendElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLLegendElementTypeId)) } } diff --git a/src/components/script/dom/htmllielement.rs b/src/components/script/dom/htmllielement.rs index 679a443c4e97..37895089ae97 100644 --- a/src/components/script/dom/htmllielement.rs +++ b/src/components/script/dom/htmllielement.rs @@ -20,10 +20,7 @@ pub struct HTMLLIElement { impl HTMLLIElementDerived for EventTarget { fn is_htmllielement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLLIElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLLIElementTypeId)) } } diff --git a/src/components/script/dom/htmllinkelement.rs b/src/components/script/dom/htmllinkelement.rs index 380a151a3fdf..eca69601efee 100644 --- a/src/components/script/dom/htmllinkelement.rs +++ b/src/components/script/dom/htmllinkelement.rs @@ -20,10 +20,7 @@ pub struct HTMLLinkElement { impl HTMLLinkElementDerived for EventTarget { fn is_htmllinkelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLLinkElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLLinkElementTypeId)) } } diff --git a/src/components/script/dom/htmlmainelement.rs b/src/components/script/dom/htmlmainelement.rs index 3efa0c68fb84..aa05a4f45f1f 100644 --- a/src/components/script/dom/htmlmainelement.rs +++ b/src/components/script/dom/htmlmainelement.rs @@ -19,10 +19,7 @@ pub struct HTMLMainElement { impl HTMLMainElementDerived for EventTarget { fn is_htmlmainelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLMainElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLMainElementTypeId)) } } diff --git a/src/components/script/dom/htmlmapelement.rs b/src/components/script/dom/htmlmapelement.rs index 53f65097ea19..b61414f73635 100644 --- a/src/components/script/dom/htmlmapelement.rs +++ b/src/components/script/dom/htmlmapelement.rs @@ -21,10 +21,7 @@ pub struct HTMLMapElement { impl HTMLMapElementDerived for EventTarget { fn is_htmlmapelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLMapElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLMapElementTypeId)) } } diff --git a/src/components/script/dom/htmlmetaelement.rs b/src/components/script/dom/htmlmetaelement.rs index 52077bf91704..07e60f74baeb 100644 --- a/src/components/script/dom/htmlmetaelement.rs +++ b/src/components/script/dom/htmlmetaelement.rs @@ -20,10 +20,7 @@ pub struct HTMLMetaElement { impl HTMLMetaElementDerived for EventTarget { fn is_htmlmetaelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLMetaElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLMetaElementTypeId)) } } diff --git a/src/components/script/dom/htmlmeterelement.rs b/src/components/script/dom/htmlmeterelement.rs index d16a82b79da0..bd2d45ac269a 100644 --- a/src/components/script/dom/htmlmeterelement.rs +++ b/src/components/script/dom/htmlmeterelement.rs @@ -20,10 +20,7 @@ pub struct HTMLMeterElement { impl HTMLMeterElementDerived for EventTarget { fn is_htmlmeterelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLMeterElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLMeterElementTypeId)) } } diff --git a/src/components/script/dom/htmlmodelement.rs b/src/components/script/dom/htmlmodelement.rs index 5a1008f7c944..e3ec4937b965 100644 --- a/src/components/script/dom/htmlmodelement.rs +++ b/src/components/script/dom/htmlmodelement.rs @@ -20,10 +20,7 @@ pub struct HTMLModElement { impl HTMLModElementDerived for EventTarget { fn is_htmlmodelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLModElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLModElementTypeId)) } } diff --git a/src/components/script/dom/htmlobjectelement.rs b/src/components/script/dom/htmlobjectelement.rs index 77bbe7551c0a..4cb8b8868d92 100644 --- a/src/components/script/dom/htmlobjectelement.rs +++ b/src/components/script/dom/htmlobjectelement.rs @@ -34,10 +34,7 @@ pub struct HTMLObjectElement { impl HTMLObjectElementDerived for EventTarget { fn is_htmlobjectelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLObjectElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLObjectElementTypeId)) } } diff --git a/src/components/script/dom/htmlolistelement.rs b/src/components/script/dom/htmlolistelement.rs index ca377dfa96d1..4655c0e636e7 100644 --- a/src/components/script/dom/htmlolistelement.rs +++ b/src/components/script/dom/htmlolistelement.rs @@ -20,10 +20,7 @@ pub struct HTMLOListElement { impl HTMLOListElementDerived for EventTarget { fn is_htmlolistelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLOListElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLOListElementTypeId)) } } diff --git a/src/components/script/dom/htmloptgroupelement.rs b/src/components/script/dom/htmloptgroupelement.rs index 75819e4b2916..c5480bfe8a0d 100644 --- a/src/components/script/dom/htmloptgroupelement.rs +++ b/src/components/script/dom/htmloptgroupelement.rs @@ -20,10 +20,7 @@ pub struct HTMLOptGroupElement { impl HTMLOptGroupElementDerived for EventTarget { fn is_htmloptgroupelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLOptGroupElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLOptGroupElementTypeId)) } } diff --git a/src/components/script/dom/htmloptionelement.rs b/src/components/script/dom/htmloptionelement.rs index 51b101a50d4b..6a2ad3227952 100644 --- a/src/components/script/dom/htmloptionelement.rs +++ b/src/components/script/dom/htmloptionelement.rs @@ -21,10 +21,7 @@ pub struct HTMLOptionElement { impl HTMLOptionElementDerived for EventTarget { fn is_htmloptionelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLOptionElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLOptionElementTypeId)) } } diff --git a/src/components/script/dom/htmloutputelement.rs b/src/components/script/dom/htmloutputelement.rs index 570eb12da25b..53fecd54ed98 100644 --- a/src/components/script/dom/htmloutputelement.rs +++ b/src/components/script/dom/htmloutputelement.rs @@ -22,10 +22,7 @@ pub struct HTMLOutputElement { impl HTMLOutputElementDerived for EventTarget { fn is_htmloutputelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLOutputElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLOutputElementTypeId)) } } diff --git a/src/components/script/dom/htmlparagraphelement.rs b/src/components/script/dom/htmlparagraphelement.rs index 226300acaa80..c434f9b6fe9f 100644 --- a/src/components/script/dom/htmlparagraphelement.rs +++ b/src/components/script/dom/htmlparagraphelement.rs @@ -20,10 +20,7 @@ pub struct HTMLParagraphElement { impl HTMLParagraphElementDerived for EventTarget { fn is_htmlparagraphelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLParagraphElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLParagraphElementTypeId)) } } diff --git a/src/components/script/dom/htmlparamelement.rs b/src/components/script/dom/htmlparamelement.rs index 4d5e2550ba9a..dc9c759289dc 100644 --- a/src/components/script/dom/htmlparamelement.rs +++ b/src/components/script/dom/htmlparamelement.rs @@ -20,10 +20,7 @@ pub struct HTMLParamElement { impl HTMLParamElementDerived for EventTarget { fn is_htmlparamelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLParamElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLParamElementTypeId)) } } diff --git a/src/components/script/dom/htmlpreelement.rs b/src/components/script/dom/htmlpreelement.rs index 1cbb52363836..dba067927ebe 100644 --- a/src/components/script/dom/htmlpreelement.rs +++ b/src/components/script/dom/htmlpreelement.rs @@ -20,10 +20,7 @@ pub struct HTMLPreElement { impl HTMLPreElementDerived for EventTarget { fn is_htmlpreelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLPreElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLPreElementTypeId)) } } diff --git a/src/components/script/dom/htmlprogresselement.rs b/src/components/script/dom/htmlprogresselement.rs index d1470c29cbfe..5f709ea11db9 100644 --- a/src/components/script/dom/htmlprogresselement.rs +++ b/src/components/script/dom/htmlprogresselement.rs @@ -20,10 +20,7 @@ pub struct HTMLProgressElement { impl HTMLProgressElementDerived for EventTarget { fn is_htmlprogresselement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLProgressElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLProgressElementTypeId)) } } diff --git a/src/components/script/dom/htmlquoteelement.rs b/src/components/script/dom/htmlquoteelement.rs index 1f3f31b12e54..d029f35c0ef9 100644 --- a/src/components/script/dom/htmlquoteelement.rs +++ b/src/components/script/dom/htmlquoteelement.rs @@ -20,10 +20,7 @@ pub struct HTMLQuoteElement { impl HTMLQuoteElementDerived for EventTarget { fn is_htmlquoteelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLQuoteElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLQuoteElementTypeId)) } } diff --git a/src/components/script/dom/htmlscriptelement.rs b/src/components/script/dom/htmlscriptelement.rs index a38877f674f9..6bff184a589d 100644 --- a/src/components/script/dom/htmlscriptelement.rs +++ b/src/components/script/dom/htmlscriptelement.rs @@ -21,10 +21,7 @@ pub struct HTMLScriptElement { impl HTMLScriptElementDerived for EventTarget { fn is_htmlscriptelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLScriptElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLScriptElementTypeId)) } } diff --git a/src/components/script/dom/htmlselectelement.rs b/src/components/script/dom/htmlselectelement.rs index a155fccd5ab1..bb6695ebbf96 100644 --- a/src/components/script/dom/htmlselectelement.rs +++ b/src/components/script/dom/htmlselectelement.rs @@ -24,10 +24,7 @@ pub struct HTMLSelectElement { impl HTMLSelectElementDerived for EventTarget { fn is_htmlselectelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLSelectElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLSelectElementTypeId)) } } diff --git a/src/components/script/dom/htmlsourceelement.rs b/src/components/script/dom/htmlsourceelement.rs index 69e9315a8138..e8b344328f87 100644 --- a/src/components/script/dom/htmlsourceelement.rs +++ b/src/components/script/dom/htmlsourceelement.rs @@ -20,10 +20,7 @@ pub struct HTMLSourceElement { impl HTMLSourceElementDerived for EventTarget { fn is_htmlsourceelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLSourceElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLSourceElementTypeId)) } } diff --git a/src/components/script/dom/htmlspanelement.rs b/src/components/script/dom/htmlspanelement.rs index c4ccddeda330..baedd6507292 100644 --- a/src/components/script/dom/htmlspanelement.rs +++ b/src/components/script/dom/htmlspanelement.rs @@ -19,10 +19,7 @@ pub struct HTMLSpanElement { impl HTMLSpanElementDerived for EventTarget { fn is_htmlspanelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLSpanElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLSpanElementTypeId)) } } diff --git a/src/components/script/dom/htmlstyleelement.rs b/src/components/script/dom/htmlstyleelement.rs index ac990e869004..cd325b930472 100644 --- a/src/components/script/dom/htmlstyleelement.rs +++ b/src/components/script/dom/htmlstyleelement.rs @@ -23,10 +23,7 @@ pub struct HTMLStyleElement { impl HTMLStyleElementDerived for EventTarget { fn is_htmlstyleelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLStyleElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLStyleElementTypeId)) } } diff --git a/src/components/script/dom/htmltablecaptionelement.rs b/src/components/script/dom/htmltablecaptionelement.rs index 7784246f3791..60d95267b0fb 100644 --- a/src/components/script/dom/htmltablecaptionelement.rs +++ b/src/components/script/dom/htmltablecaptionelement.rs @@ -20,10 +20,7 @@ pub struct HTMLTableCaptionElement { impl HTMLTableCaptionElementDerived for EventTarget { fn is_htmltablecaptionelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLTableCaptionElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLTableCaptionElementTypeId)) } } diff --git a/src/components/script/dom/htmltablecolelement.rs b/src/components/script/dom/htmltablecolelement.rs index da7b2d9d0ef0..b060a1956e22 100644 --- a/src/components/script/dom/htmltablecolelement.rs +++ b/src/components/script/dom/htmltablecolelement.rs @@ -20,10 +20,7 @@ pub struct HTMLTableColElement { impl HTMLTableColElementDerived for EventTarget { fn is_htmltablecolelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLTableColElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLTableColElementTypeId)) } } diff --git a/src/components/script/dom/htmltabledatacellelement.rs b/src/components/script/dom/htmltabledatacellelement.rs index c62fc8fd1915..e01ebd2ef0b6 100644 --- a/src/components/script/dom/htmltabledatacellelement.rs +++ b/src/components/script/dom/htmltabledatacellelement.rs @@ -19,10 +19,7 @@ pub struct HTMLTableDataCellElement { impl HTMLTableDataCellElementDerived for EventTarget { fn is_htmltabledatacellelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLTableDataCellElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLTableDataCellElementTypeId)) } } diff --git a/src/components/script/dom/htmltableelement.rs b/src/components/script/dom/htmltableelement.rs index 918cbddf08de..a99a83fa39ad 100644 --- a/src/components/script/dom/htmltableelement.rs +++ b/src/components/script/dom/htmltableelement.rs @@ -20,10 +20,7 @@ pub struct HTMLTableElement { impl HTMLTableElementDerived for EventTarget { fn is_htmltableelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLTableElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLTableElementTypeId)) } } diff --git a/src/components/script/dom/htmltableheadercellelement.rs b/src/components/script/dom/htmltableheadercellelement.rs index 1d4245fef5a5..f8a50353ae76 100644 --- a/src/components/script/dom/htmltableheadercellelement.rs +++ b/src/components/script/dom/htmltableheadercellelement.rs @@ -19,10 +19,7 @@ pub struct HTMLTableHeaderCellElement { impl HTMLTableHeaderCellElementDerived for EventTarget { fn is_htmltableheadercellelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLTableHeaderCellElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLTableHeaderCellElementTypeId)) } } diff --git a/src/components/script/dom/htmltablerowelement.rs b/src/components/script/dom/htmltablerowelement.rs index 47004c75f6fd..0c5191fbf7e3 100644 --- a/src/components/script/dom/htmltablerowelement.rs +++ b/src/components/script/dom/htmltablerowelement.rs @@ -20,10 +20,7 @@ pub struct HTMLTableRowElement { impl HTMLTableRowElementDerived for EventTarget { fn is_htmltablerowelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLTableRowElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLTableRowElementTypeId)) } } diff --git a/src/components/script/dom/htmltablesectionelement.rs b/src/components/script/dom/htmltablesectionelement.rs index 200c10e649dd..d5d33b29dfca 100644 --- a/src/components/script/dom/htmltablesectionelement.rs +++ b/src/components/script/dom/htmltablesectionelement.rs @@ -20,10 +20,7 @@ pub struct HTMLTableSectionElement { impl HTMLTableSectionElementDerived for EventTarget { fn is_htmltablesectionelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLTableSectionElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLTableSectionElementTypeId)) } } diff --git a/src/components/script/dom/htmltemplateelement.rs b/src/components/script/dom/htmltemplateelement.rs index 30bf8219d608..fc80ec01d31a 100644 --- a/src/components/script/dom/htmltemplateelement.rs +++ b/src/components/script/dom/htmltemplateelement.rs @@ -19,10 +19,7 @@ pub struct HTMLTemplateElement { impl HTMLTemplateElementDerived for EventTarget { fn is_htmltemplateelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLTemplateElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLTemplateElementTypeId)) } } diff --git a/src/components/script/dom/htmltextareaelement.rs b/src/components/script/dom/htmltextareaelement.rs index 57854044254c..be10b719bbaa 100644 --- a/src/components/script/dom/htmltextareaelement.rs +++ b/src/components/script/dom/htmltextareaelement.rs @@ -20,10 +20,7 @@ pub struct HTMLTextAreaElement { impl HTMLTextAreaElementDerived for EventTarget { fn is_htmltextareaelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLTextAreaElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLTextAreaElementTypeId)) } } diff --git a/src/components/script/dom/htmltimeelement.rs b/src/components/script/dom/htmltimeelement.rs index 8993c6a2df58..104d2696721f 100644 --- a/src/components/script/dom/htmltimeelement.rs +++ b/src/components/script/dom/htmltimeelement.rs @@ -20,10 +20,7 @@ pub struct HTMLTimeElement { impl HTMLTimeElementDerived for EventTarget { fn is_htmltimeelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLTimeElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLTimeElementTypeId)) } } diff --git a/src/components/script/dom/htmltitleelement.rs b/src/components/script/dom/htmltitleelement.rs index dedba6e9ba43..d1013adbe372 100644 --- a/src/components/script/dom/htmltitleelement.rs +++ b/src/components/script/dom/htmltitleelement.rs @@ -20,10 +20,7 @@ pub struct HTMLTitleElement { impl HTMLTitleElementDerived for EventTarget { fn is_htmltitleelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLTitleElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLTitleElementTypeId)) } } diff --git a/src/components/script/dom/htmltrackelement.rs b/src/components/script/dom/htmltrackelement.rs index 8c95fa967af5..a874c5b63391 100644 --- a/src/components/script/dom/htmltrackelement.rs +++ b/src/components/script/dom/htmltrackelement.rs @@ -20,10 +20,7 @@ pub struct HTMLTrackElement { impl HTMLTrackElementDerived for EventTarget { fn is_htmltrackelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLTrackElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLTrackElementTypeId)) } } diff --git a/src/components/script/dom/htmlulistelement.rs b/src/components/script/dom/htmlulistelement.rs index c61ec58d9a05..932ff26e9e9d 100644 --- a/src/components/script/dom/htmlulistelement.rs +++ b/src/components/script/dom/htmlulistelement.rs @@ -20,10 +20,7 @@ pub struct HTMLUListElement { impl HTMLUListElementDerived for EventTarget { fn is_htmlulistelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLUListElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLUListElementTypeId)) } } diff --git a/src/components/script/dom/htmlunknownelement.rs b/src/components/script/dom/htmlunknownelement.rs index 855b17578e5f..a84d21ef3acc 100644 --- a/src/components/script/dom/htmlunknownelement.rs +++ b/src/components/script/dom/htmlunknownelement.rs @@ -19,10 +19,7 @@ pub struct HTMLUnknownElement { impl HTMLUnknownElementDerived for EventTarget { fn is_htmlunknownelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLUnknownElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLUnknownElementTypeId)) } } diff --git a/src/components/script/dom/htmlvideoelement.rs b/src/components/script/dom/htmlvideoelement.rs index ce20e0c1b13a..a172346d77c8 100644 --- a/src/components/script/dom/htmlvideoelement.rs +++ b/src/components/script/dom/htmlvideoelement.rs @@ -20,10 +20,7 @@ pub struct HTMLVideoElement { impl HTMLVideoElementDerived for EventTarget { fn is_htmlvideoelement(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ElementNodeTypeId(HTMLVideoElementTypeId)) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ElementNodeTypeId(HTMLVideoElementTypeId)) } } diff --git a/src/components/script/dom/node.rs b/src/components/script/dom/node.rs index 0f6c3f8a65c5..214dee08bafa 100644 --- a/src/components/script/dom/node.rs +++ b/src/components/script/dom/node.rs @@ -497,36 +497,22 @@ impl<'a> NodeHelpers for JSRef<'a, Node> { #[inline] fn is_document(&self) -> bool { - match self.type_id() { - DocumentNodeTypeId => true, - _ => false - } + self.type_id() == DocumentNodeTypeId } #[inline] fn is_anchor_element(&self) -> bool { - match self.type_id() { - ElementNodeTypeId(HTMLAnchorElementTypeId) => true, - _ => false - } + self.type_id() == ElementNodeTypeId(HTMLAnchorElementTypeId) } #[inline] fn is_doctype(&self) -> bool { - match self.type_id { - DoctypeNodeTypeId => true, - _ => false - } + self.type_id == DoctypeNodeTypeId } #[inline] fn is_text(&self) -> bool { - // FIXME(pcwalton): Temporary workaround for the lack of inlining of autogenerated `Eq` - // implementations in Rust. - match self.type_id() { - TextNodeTypeId => true, - _ => false - } + self.type_id() == TextNodeTypeId } fn get_hover_state(&self) -> bool { diff --git a/src/components/script/dom/processinginstruction.rs b/src/components/script/dom/processinginstruction.rs index 2b7846b9f535..7138735db374 100644 --- a/src/components/script/dom/processinginstruction.rs +++ b/src/components/script/dom/processinginstruction.rs @@ -20,10 +20,7 @@ pub struct ProcessingInstruction { impl ProcessingInstructionDerived for EventTarget { fn is_processinginstruction(&self) -> bool { - match self.type_id { - NodeTargetTypeId(ProcessingInstructionNodeTypeId) => true, - _ => false - } + self.type_id == NodeTargetTypeId(ProcessingInstructionNodeTypeId) } } diff --git a/src/components/script/dom/text.rs b/src/components/script/dom/text.rs index b8d7530fe589..e8653fe22b01 100644 --- a/src/components/script/dom/text.rs +++ b/src/components/script/dom/text.rs @@ -21,10 +21,7 @@ pub struct Text { impl TextDerived for EventTarget { fn is_text(&self) -> bool { - match self.type_id { - NodeTargetTypeId(TextNodeTypeId) => true, - _ => false - } + self.type_id == NodeTargetTypeId(TextNodeTypeId) } } diff --git a/src/components/script/dom/xmlhttprequest.rs b/src/components/script/dom/xmlhttprequest.rs index 1fe615ff3e4c..adbd5eac9600 100644 --- a/src/components/script/dom/xmlhttprequest.rs +++ b/src/components/script/dom/xmlhttprequest.rs @@ -176,9 +176,6 @@ impl Reflectable for XMLHttpRequest { impl XMLHttpRequestDerived for EventTarget { fn is_xmlhttprequest(&self) -> bool { - match self.type_id { - XMLHttpRequestTargetTypeId(XMLHttpRequestTypeId) => true, - _ => false - } + self.type_id == XMLHttpRequestTargetTypeId(XMLHttpRequestTypeId) } -} \ No newline at end of file +} diff --git a/src/components/script/dom/xmlhttprequestupload.rs b/src/components/script/dom/xmlhttprequestupload.rs index 6f373ab0a65f..bd8dd38c8062 100644 --- a/src/components/script/dom/xmlhttprequestupload.rs +++ b/src/components/script/dom/xmlhttprequestupload.rs @@ -40,12 +40,9 @@ impl Reflectable for XMLHttpRequestUpload { impl XMLHttpRequestUploadDerived for EventTarget { fn is_xmlhttprequestupload(&self) -> bool { - match self.type_id { - XMLHttpRequestTargetTypeId(XMLHttpRequestUploadTypeId) => true, - _ => false - } + self.type_id == XMLHttpRequestTargetTypeId(XMLHttpRequestUploadTypeId) } } pub trait XMLHttpRequestUploadMethods { -} \ No newline at end of file +}