Cleanup code that was warned by rust-clippy

9 files changed, 273 insertions, 284 deletions

diff --git a/components/layout/table.rs b/components/layout/table.rs
index 496a05f80d0..62b8807de07 100644
--- a/components/layout/table.rs
+++ b/components/layout/table.rs
@@ -810,17 +810,12 @@ impl TableLikeFlow for BlockFlow {
             let mut candidate_block_size_iterator = CandidateBSizeIterator::new(
                 &self.fragment,
                 self.base.block_container_explicit_block_size);
-            loop {
-                match candidate_block_size_iterator.next() {
-                    Some(candidate_block_size) => {
-                        candidate_block_size_iterator.candidate_value =
-                            match candidate_block_size {
-                                MaybeAuto::Auto => block_size,
-                                MaybeAuto::Specified(value) => value
-                            }
-                    }
-                    None => break,
-                }
+            while let Some(candidate_block_size) = candidate_block_size_iterator.next() {
+                candidate_block_size_iterator.candidate_value =
+                    match candidate_block_size {
+                        MaybeAuto::Auto => block_size,
+                        MaybeAuto::Specified(value) => value
+                    };
             }
 
             // Adjust `current_block_offset` as necessary to account for the explicitly-specified
diff --git a/components/net/cookie.rs b/components/net/cookie.rs
index 45b2b48926c..0bc77eae251 100644
--- a/components/net/cookie.rs
+++ b/components/net/cookie.rs
@@ -161,6 +161,6 @@ impl Cookie {
             return false;
         }
 
-        return true;
+        true
     }
 }
diff --git a/components/net/fetch/cors_cache.rs b/components/net/fetch/cors_cache.rs
index d233256851e..10f6752655f 100644
--- a/components/net/fetch/cors_cache.rs
+++ b/components/net/fetch/cors_cache.rs
@@ -113,13 +113,12 @@ impl BasicCORSCache {
                                 header_name: &str) -> Option<&'a mut CORSCacheEntry> {
         self.cleanup();
         let BasicCORSCache(ref mut buf) = *self;
-        let entry = buf.iter_mut().find(|e| e.origin.scheme == request.origin.scheme &&
-                            e.origin.host() == request.origin.host() &&
-                            e.origin.port() == request.origin.port() &&
-                            e.url == request.destination &&
-                            e.credentials == request.credentials &&
-                            e.header_or_method.match_header(header_name));
-        entry
+        buf.iter_mut().find(|e| e.origin.scheme == request.origin.scheme &&
+                                e.origin.host() == request.origin.host() &&
+                                e.origin.port() == request.origin.port() &&
+                                e.url == request.destination &&
+                                e.credentials == request.credentials &&
+                                e.header_or_method.match_header(header_name))
     }
 
     fn find_entry_by_method<'a>(&'a mut self, request: &CacheRequestDetails,
@@ -127,13 +126,12 @@ impl BasicCORSCache {
         // we can take the method from CORSRequest itself
         self.cleanup();
         let BasicCORSCache(ref mut buf) = *self;
-        let entry = buf.iter_mut().find(|e| e.origin.scheme == request.origin.scheme &&
-                            e.origin.host() == request.origin.host() &&
-                            e.origin.port() == request.origin.port() &&
-                            e.url == request.destination &&
-                            e.credentials == request.credentials &&
-                            e.header_or_method.match_method(&method));
-        entry
+        buf.iter_mut().find(|e| e.origin.scheme == request.origin.scheme &&
+                                e.origin.host() == request.origin.host() &&
+                                e.origin.port() == request.origin.port() &&
+                                e.url == request.destination &&
+                                e.credentials == request.credentials &&
+                                e.header_or_method.match_method(&method))
     }
 }
 
diff --git a/components/net/file_loader.rs b/components/net/file_loader.rs
index 5a18ab385fe..6af036f0f14 100644
--- a/components/net/file_loader.rs
+++ b/components/net/file_loader.rs
@@ -24,7 +24,7 @@ enum ReadStatus {
 fn read_block(reader: &mut File) -> Result<ReadStatus, String> {
     let mut buf = vec![0; READ_SIZE];
     match reader.read(&mut buf) {
-        Ok(0) => return Ok(ReadStatus::EOF),
+        Ok(0) => Ok(ReadStatus::EOF),
         Ok(n) => {
             buf.truncate(n);
             Ok(ReadStatus::Partial(buf))
diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs
index bf52f72882b..ef049a87fe3 100644
--- a/components/net/http_loader.rs
+++ b/components/net/http_loader.rs
@@ -419,19 +419,19 @@ impl<R: HttpResponse> StreamedResponse<R> {
                 let result = GzDecoder::new(response);
                 match result {
                     Ok(response_decoding) => {
-                        return Ok(StreamedResponse::new(m, Decoder::Gzip(response_decoding)));
+                        Ok(StreamedResponse::new(m, Decoder::Gzip(response_decoding)))
                     }
                     Err(err) => {
-                        return Err(LoadError::Decoding(m.final_url, err.to_string()));
+                        Err(LoadError::Decoding(m.final_url, err.to_string()))
                     }
                 }
             }
             Some(Encoding::Deflate) => {
                 let response_decoding = DeflateDecoder::new(response);
-                return Ok(StreamedResponse::new(m, Decoder::Deflate(response_decoding)));
+                Ok(StreamedResponse::new(m, Decoder::Deflate(response_decoding)))
             }
             _ => {
-                return Ok(StreamedResponse::new(m, Decoder::Plain(response)));
+                Ok(StreamedResponse::new(m, Decoder::Plain(response)))
             }
         }
     }
diff --git a/components/net/resource_task.rs b/components/net/resource_task.rs
index f84f281ea1b..1631b5a8e7d 100644
--- a/components/net/resource_task.rs
+++ b/components/net/resource_task.rs
@@ -74,7 +74,7 @@ pub fn start_sending_sniffed_opt(start_chan: LoadConsumer, mut metadata: Metadat
         if let Some(ref headers) = metadata.headers {
             if let Some(ref raw_content_type) = headers.get_raw("content-type") {
                 if raw_content_type.len() > 0 {
-                    let ref last_raw_content_type = raw_content_type[raw_content_type.len() - 1];
+                    let last_raw_content_type = &raw_content_type[raw_content_type.len() - 1];
                     check_for_apache_bug = apache_bug_predicate(last_raw_content_type)
                 }
             }
diff --git a/components/script/dom/virtualmethods.rs b/components/script/dom/virtualmethods.rs
index 639b1ebd756..49d5ae8670d 100644
--- a/components/script/dom/virtualmethods.rs
+++ b/components/script/dom/virtualmethods.rs
@@ -119,137 +119,137 @@ pub trait VirtualMethods {
 /// method call on the trait object will invoke the corresponding method on the
 /// concrete type, propagating up the parent hierarchy unless otherwise
 /// interrupted.
-pub fn vtable_for<'a>(node: &'a Node) -> &'a (VirtualMethods + 'a) {
+pub fn vtable_for(node: &Node) -> &VirtualMethods {
     match node.type_id() {
         NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLAnchorElement)) => {
             let element = HTMLAnchorElementCast::to_ref(node).unwrap();
-            element as &'a (VirtualMethods + 'a)
+            element as &VirtualMethods
         }
         NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLAppletElement)) => {
-            HTMLAppletElementCast::to_ref(node).unwrap() as &'a (VirtualMethods + 'a)
+            HTMLAppletElementCast::to_ref(node).unwrap() as &VirtualMethods
         }
         NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLAreaElement)) => {
             let element = HTMLAreaElementCast::to_ref(node).unwrap();
-            element as &'a (VirtualMethods + 'a)
+            element as &VirtualMethods
         }
         NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLBaseElement)) => {
             let element = HTMLBaseElementCast::to_ref(node).unwrap();
-            element as &'a (VirtualMethods + 'a)
+            element as &VirtualMethods
         }
         NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLBodyElement)) => {
             let element = HTMLBodyElementCast::to_ref(node).unwrap();
-            element as &'a (VirtualMethods + 'a)
+            element as &VirtualMethods
         }
         NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLButtonElement)) => {
             let element = HTMLButtonElementCast::to_ref(node).unwrap();
-            element as &'a (VirtualMethods + 'a)
+            element as &VirtualMethods
         }
         NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLCanvasElement)) => {
             let element = HTMLCanvasElementCast::to_ref(node).unwrap();
-            element as &'a (VirtualMethods + 'a)
+            element as &VirtualMethods
         }
         NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLFieldSetElement)) => {
             let element = HTMLFieldSetElementCast::to_ref(node).unwrap();
-            element as &'a (VirtualMethods + 'a)
+            element as &VirtualMethods
         }
         NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLFontElement)) => {
             let element = HTMLFontElementCast::to_ref(node).unwrap();
-            element as &'a (VirtualMethods + 'a)
+            element as &VirtualMethods
         }
         NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLFormElement)) => {
             let element = HTMLFormElementCast::to_ref(node).unwrap();
-            element as &'a (VirtualMethods + 'a)
+            element as &VirtualMethods
         }
         NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLHeadElement)) => {
             let element = HTMLHeadElementCast::to_ref(node).unwrap();
-            element as &'a (VirtualMethods + 'a)
+            element as &VirtualMethods
         }
         NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLImageElement)) => {
             let element = HTMLImageElementCast::to_ref(node).unwrap();
-            element as &'a (VirtualMethods + 'a)
+            element as &VirtualMethods
         }
         NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLIFrameElement)) => {
             let element = HTMLIFrameElementCast::to_ref(node).unwrap();
-            element as &'a (VirtualMethods + 'a)
+            element as &VirtualMethods
         }
         NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLInputElement)) => {
             let element = HTMLInputElementCast::to_ref(node).unwrap();
-            element as &'a (VirtualMethods + 'a)
+            element as &VirtualMethods
         }
         NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLLinkElement)) => {
             let element = HTMLLinkElementCast::to_ref(node).unwrap();
-            element as &'a (VirtualMethods + 'a)
+            element as &VirtualMethods
         }
         NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLMetaElement)) => {
             let element = HTMLMetaElementCast::to_ref(node).unwrap();
-            element as &'a (VirtualMethods + 'a)
+            element as &VirtualMethods
         }
         NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLObjectElement)) => {
             let element = HTMLObjectElementCast::to_ref(node).unwrap();
-            element as &'a (VirtualMethods + 'a)
+            element as &VirtualMethods
         }
         NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLOptGroupElement)) => {
             let element = HTMLOptGroupElementCast::to_ref(node).unwrap();
-            element as &'a (VirtualMethods + 'a)
+            element as &VirtualMethods
         }
         NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLOptionElement)) => {
             let element = HTMLOptionElementCast::to_ref(node).unwrap();
-            element as &'a (VirtualMethods + 'a)
+            element as &VirtualMethods
         }
         NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLScriptElement)) => {
             let element = HTMLScriptElementCast::to_ref(node).unwrap();
-            element as &'a (VirtualMethods + 'a)
+            element as &VirtualMethods
         }
         NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLSelectElement)) => {
             let element = HTMLSelectElementCast::to_ref(node).unwrap();
-            element as &'a (VirtualMethods + 'a)
+            element as &VirtualMethods
         }
         NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLStyleElement)) => {
             let element = HTMLStyleElementCast::to_ref(node).unwrap();
-            element as &'a (VirtualMethods + 'a)
+            element as &VirtualMethods
         }
         NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTableElement)) => {
             let element =
                 HTMLTableElementCast::to_ref(node).unwrap();
-            element as &'a (VirtualMethods + 'a)
+            element as &VirtualMethods
         }
         NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTableCellElement(_))) => {
             let element =
                 HTMLTableCellElementCast::to_ref(node).unwrap();
-            element as &'a (VirtualMethods + 'a)
+            element as &VirtualMethods
         }
         NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTableRowElement)) => {
             let element =
                 HTMLTableRowElementCast::to_ref(node).unwrap();
-            element as &'a (VirtualMethods + 'a)
+            element as &VirtualMethods
         }
         NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTableSectionElement)) => {
             let element =
                 HTMLTableSectionElementCast::to_ref(node).unwrap();
-            element as &'a (VirtualMethods + 'a)
+            element as &VirtualMethods
         }
         NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTemplateElement)) => {
-            HTMLTemplateElementCast::to_ref(node).unwrap() as &'a (VirtualMethods + 'a)
+            HTMLTemplateElementCast::to_ref(node).unwrap() as &VirtualMethods
         }
         NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTextAreaElement)) => {
             let element = HTMLTextAreaElementCast::to_ref(node).unwrap();
-            element as &'a (VirtualMethods + 'a)
+            element as &VirtualMethods
         }
         NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTitleElement)) => {
             let element =
                 HTMLTitleElementCast::to_ref(node).unwrap();
-            element as &'a (VirtualMethods + 'a)
+            element as &VirtualMethods
         }
         NodeTypeId::Element(ElementTypeId::Element) => {
             let element = ElementCast::to_ref(node).unwrap();
-            element as &'a (VirtualMethods + 'a)
+            element as &VirtualMethods
         }
         NodeTypeId::Element(_) => {
             let element = HTMLElementCast::to_ref(node).unwrap();
-            element as &'a (VirtualMethods + 'a)
+            element as &VirtualMethods
         }
         _ => {
-            node as &'a (VirtualMethods + 'a)
+            node as &VirtualMethods
         }
     }
 }
diff --git a/components/script/mem.rs b/components/script/mem.rs
index 2e46ffea85e..51eaa9359df 100644
--- a/components/script/mem.rs
+++ b/components/script/mem.rs
@@ -28,224 +28,224 @@ fn heap_size_of_self_and_children<T: HeapSizeOf>(obj: &T) -> usize {
 pub fn heap_size_of_eventtarget(target: &EventTarget) -> usize {
     //TODO: add more specific matches for concrete element types as derive(HeapSizeOf) is
     //      added to each one.
-    match target.type_id() {
-        &EventTargetTypeId::Window =>
+    match *target.type_id() {
+        EventTargetTypeId::Window =>
             heap_size_of_self_and_children(WindowCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::CharacterData(_)) =>
+        EventTargetTypeId::Node(NodeTypeId::CharacterData(_)) =>
             heap_size_of_self_and_children(CharacterDataCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Document) =>
+        EventTargetTypeId::Node(NodeTypeId::Document) =>
             heap_size_of_self_and_children(DocumentCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(ElementTypeId::Element)) =>
+        EventTargetTypeId::Node(NodeTypeId::Element(ElementTypeId::Element)) =>
             heap_size_of_self_and_children(ElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLElement))) =>
-            heap_size_of_self_and_children(HTMLElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLAnchorElement))) =>
-            heap_size_of_self_and_children(HTMLAnchorElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLAppletElement))) =>
-            heap_size_of_self_and_children(HTMLAppletElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLAreaElement))) =>
-            heap_size_of_self_and_children(HTMLAreaElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLBaseElement))) =>
-            heap_size_of_self_and_children(HTMLBaseElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLBRElement))) =>
-            heap_size_of_self_and_children(HTMLBRElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLBodyElement))) =>
-            heap_size_of_self_and_children(HTMLBodyElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLButtonElement))) =>
-            heap_size_of_self_and_children(HTMLButtonElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLCanvasElement))) =>
-            heap_size_of_self_and_children(HTMLCanvasElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLDataElement))) =>
-            heap_size_of_self_and_children(HTMLDataElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLDataListElement))) =>
-            heap_size_of_self_and_children(HTMLDataListElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLDialogElement))) =>
-            heap_size_of_self_and_children(HTMLDialogElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLDirectoryElement))) =>
-            heap_size_of_self_and_children(HTMLDirectoryElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLDListElement))) =>
-            heap_size_of_self_and_children(HTMLDListElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLDivElement))) =>
-            heap_size_of_self_and_children(HTMLDivElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLEmbedElement))) =>
-            heap_size_of_self_and_children(HTMLEmbedElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLFieldSetElement))) =>
-            heap_size_of_self_and_children(HTMLFieldSetElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLFontElement))) =>
-            heap_size_of_self_and_children(HTMLFontElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLFormElement))) =>
-            heap_size_of_self_and_children(HTMLFormElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLFrameElement))) =>
-            heap_size_of_self_and_children(HTMLFrameElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLFrameSetElement))) =>
-            heap_size_of_self_and_children(HTMLFrameSetElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLHRElement))) =>
-            heap_size_of_self_and_children(HTMLHRElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLHeadElement))) =>
-            heap_size_of_self_and_children(HTMLHeadElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLHeadingElement))) =>
-            heap_size_of_self_and_children(HTMLHeadingElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLHtmlElement))) =>
-            heap_size_of_self_and_children(HTMLHtmlElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLIFrameElement))) =>
-            heap_size_of_self_and_children(HTMLIFrameElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLImageElement))) =>
-            heap_size_of_self_and_children(HTMLImageElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLInputElement))) =>
-            heap_size_of_self_and_children(HTMLInputElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLLabelElement))) =>
-            heap_size_of_self_and_children(HTMLLabelElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLLegendElement))) =>
-            heap_size_of_self_and_children(HTMLLegendElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLLinkElement))) =>
-            heap_size_of_self_and_children(HTMLLinkElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLLIElement))) =>
-            heap_size_of_self_and_children(HTMLLIElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLMapElement))) =>
-            heap_size_of_self_and_children(HTMLMapElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(ElementTypeId::HTMLElement(
-        HTMLElementTypeId::HTMLMediaElement(HTMLAudioElement)))) =>
-            heap_size_of_self_and_children(HTMLAudioElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(ElementTypeId::HTMLElement(
-        HTMLElementTypeId::HTMLMediaElement(HTMLVideoElement)))) =>
-            heap_size_of_self_and_children(HTMLVideoElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLMetaElement))) =>
-            heap_size_of_self_and_children(HTMLMetaElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLMeterElement))) =>
-            heap_size_of_self_and_children(HTMLMeterElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLModElement))) =>
-            heap_size_of_self_and_children(HTMLModElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLObjectElement))) =>
-            heap_size_of_self_and_children(HTMLObjectElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLOListElement))) =>
-            heap_size_of_self_and_children(HTMLOListElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLOptGroupElement))) =>
-            heap_size_of_self_and_children(HTMLOptGroupElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLOptionElement))) =>
-            heap_size_of_self_and_children(HTMLOptionElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLOutputElement))) =>
-            heap_size_of_self_and_children(HTMLOutputElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLParagraphElement))) =>
-            heap_size_of_self_and_children(HTMLParagraphElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLParamElement))) =>
-            heap_size_of_self_and_children(HTMLParamElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLPreElement))) =>
-            heap_size_of_self_and_children(HTMLPreElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLProgressElement))) =>
-            heap_size_of_self_and_children(HTMLProgressElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLQuoteElement))) =>
-            heap_size_of_self_and_children(HTMLQuoteElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLScriptElement))) =>
-            heap_size_of_self_and_children(HTMLScriptElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLSelectElement))) =>
-            heap_size_of_self_and_children(HTMLSelectElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLSourceElement))) =>
-            heap_size_of_self_and_children(HTMLSourceElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLSpanElement))) =>
-            heap_size_of_self_and_children(HTMLSpanElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLStyleElement))) =>
-            heap_size_of_self_and_children(HTMLStyleElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTableElement))) =>
-            heap_size_of_self_and_children(HTMLTableElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTableCaptionElement))) =>
-            heap_size_of_self_and_children(HTMLTableCaptionElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(ElementTypeId::HTMLElement(
-        HTMLElementTypeId::HTMLTableCellElement(HTMLTableDataCellElement)))) =>
-            heap_size_of_self_and_children(HTMLTableDataCellElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(ElementTypeId::HTMLElement(
-        HTMLElementTypeId::HTMLTableCellElement(HTMLTableHeaderCellElement)))) =>
-            heap_size_of_self_and_children(HTMLTableHeaderCellElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTableColElement))) =>
-            heap_size_of_self_and_children(HTMLTableColElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTableRowElement))) =>
-            heap_size_of_self_and_children(HTMLTableRowElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTableSectionElement))) =>
-            heap_size_of_self_and_children(HTMLTableSectionElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTemplateElement))) =>
-            heap_size_of_self_and_children(HTMLTemplateElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTextAreaElement))) =>
-            heap_size_of_self_and_children(HTMLTextAreaElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTimeElement))) =>
-            heap_size_of_self_and_children(HTMLTimeElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTitleElement))) =>
-            heap_size_of_self_and_children(HTMLTitleElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTrackElement))) =>
-            heap_size_of_self_and_children(HTMLTrackElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLUListElement))) =>
-            heap_size_of_self_and_children(HTMLUListElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::Element(
-        ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLUnknownElement))) =>
-            heap_size_of_self_and_children(HTMLUnknownElementCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::WebSocket => 0,
-        &EventTargetTypeId::Worker => 0,
-        &EventTargetTypeId::FileReader => 0,
-        &EventTargetTypeId::WorkerGlobalScope(_) => 0,
-        &EventTargetTypeId::XMLHttpRequestEventTarget(_) => 0,
-        &EventTargetTypeId::Node(NodeTypeId::DocumentType) =>
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLElement))) =>
+                heap_size_of_self_and_children(HTMLElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLAnchorElement))) =>
+                heap_size_of_self_and_children(HTMLAnchorElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLAppletElement))) =>
+                heap_size_of_self_and_children(HTMLAppletElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLAreaElement))) =>
+                heap_size_of_self_and_children(HTMLAreaElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLBaseElement))) =>
+                heap_size_of_self_and_children(HTMLBaseElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLBRElement))) =>
+                heap_size_of_self_and_children(HTMLBRElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLBodyElement))) =>
+                heap_size_of_self_and_children(HTMLBodyElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLButtonElement))) =>
+                heap_size_of_self_and_children(HTMLButtonElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLCanvasElement))) =>
+                heap_size_of_self_and_children(HTMLCanvasElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLDataElement))) =>
+                heap_size_of_self_and_children(HTMLDataElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLDataListElement))) =>
+                heap_size_of_self_and_children(HTMLDataListElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLDialogElement))) =>
+                heap_size_of_self_and_children(HTMLDialogElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLDirectoryElement))) =>
+                heap_size_of_self_and_children(HTMLDirectoryElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLDListElement))) =>
+                heap_size_of_self_and_children(HTMLDListElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLDivElement))) =>
+                heap_size_of_self_and_children(HTMLDivElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLEmbedElement))) =>
+                heap_size_of_self_and_children(HTMLEmbedElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLFieldSetElement))) =>
+                heap_size_of_self_and_children(HTMLFieldSetElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLFontElement))) =>
+                heap_size_of_self_and_children(HTMLFontElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLFormElement))) =>
+                heap_size_of_self_and_children(HTMLFormElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLFrameElement))) =>
+                heap_size_of_self_and_children(HTMLFrameElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLFrameSetElement))) =>
+                heap_size_of_self_and_children(HTMLFrameSetElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLHRElement))) =>
+                heap_size_of_self_and_children(HTMLHRElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLHeadElement))) =>
+                heap_size_of_self_and_children(HTMLHeadElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLHeadingElement))) =>
+                heap_size_of_self_and_children(HTMLHeadingElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLHtmlElement))) =>
+                heap_size_of_self_and_children(HTMLHtmlElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLIFrameElement))) =>
+                heap_size_of_self_and_children(HTMLIFrameElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLImageElement))) =>
+                heap_size_of_self_and_children(HTMLImageElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLInputElement))) =>
+                heap_size_of_self_and_children(HTMLInputElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLLabelElement))) =>
+                heap_size_of_self_and_children(HTMLLabelElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLLegendElement))) =>
+                heap_size_of_self_and_children(HTMLLegendElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLLinkElement))) =>
+                heap_size_of_self_and_children(HTMLLinkElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLLIElement))) =>
+                heap_size_of_self_and_children(HTMLLIElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLMapElement))) =>
+                heap_size_of_self_and_children(HTMLMapElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(ElementTypeId::HTMLElement(
+            HTMLElementTypeId::HTMLMediaElement(HTMLAudioElement)))) =>
+                heap_size_of_self_and_children(HTMLAudioElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(ElementTypeId::HTMLElement(
+            HTMLElementTypeId::HTMLMediaElement(HTMLVideoElement)))) =>
+                heap_size_of_self_and_children(HTMLVideoElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLMetaElement))) =>
+                heap_size_of_self_and_children(HTMLMetaElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLMeterElement))) =>
+                heap_size_of_self_and_children(HTMLMeterElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLModElement))) =>
+                heap_size_of_self_and_children(HTMLModElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLObjectElement))) =>
+                heap_size_of_self_and_children(HTMLObjectElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLOListElement))) =>
+                heap_size_of_self_and_children(HTMLOListElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLOptGroupElement))) =>
+                heap_size_of_self_and_children(HTMLOptGroupElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLOptionElement))) =>
+                heap_size_of_self_and_children(HTMLOptionElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLOutputElement))) =>
+                heap_size_of_self_and_children(HTMLOutputElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLParagraphElement))) =>
+                heap_size_of_self_and_children(HTMLParagraphElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLParamElement))) =>
+                heap_size_of_self_and_children(HTMLParamElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLPreElement))) =>
+                heap_size_of_self_and_children(HTMLPreElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLProgressElement))) =>
+                heap_size_of_self_and_children(HTMLProgressElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLQuoteElement))) =>
+                heap_size_of_self_and_children(HTMLQuoteElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLScriptElement))) =>
+                heap_size_of_self_and_children(HTMLScriptElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLSelectElement))) =>
+                heap_size_of_self_and_children(HTMLSelectElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLSourceElement))) =>
+                heap_size_of_self_and_children(HTMLSourceElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLSpanElement))) =>
+                heap_size_of_self_and_children(HTMLSpanElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLStyleElement))) =>
+                heap_size_of_self_and_children(HTMLStyleElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTableElement))) =>
+                heap_size_of_self_and_children(HTMLTableElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTableCaptionElement))) =>
+                heap_size_of_self_and_children(HTMLTableCaptionElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(ElementTypeId::HTMLElement(
+            HTMLElementTypeId::HTMLTableCellElement(HTMLTableDataCellElement)))) =>
+                heap_size_of_self_and_children(HTMLTableDataCellElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(ElementTypeId::HTMLElement(
+            HTMLElementTypeId::HTMLTableCellElement(HTMLTableHeaderCellElement)))) =>
+                heap_size_of_self_and_children(HTMLTableHeaderCellElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTableColElement))) =>
+                heap_size_of_self_and_children(HTMLTableColElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTableRowElement))) =>
+                heap_size_of_self_and_children(HTMLTableRowElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTableSectionElement))) =>
+                heap_size_of_self_and_children(HTMLTableSectionElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTemplateElement))) =>
+                heap_size_of_self_and_children(HTMLTemplateElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTextAreaElement))) =>
+                heap_size_of_self_and_children(HTMLTextAreaElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTimeElement))) =>
+                heap_size_of_self_and_children(HTMLTimeElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTitleElement))) =>
+                heap_size_of_self_and_children(HTMLTitleElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTrackElement))) =>
+                heap_size_of_self_and_children(HTMLTrackElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLUListElement))) =>
+                heap_size_of_self_and_children(HTMLUListElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::Node(NodeTypeId::Element(
+            ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLUnknownElement))) =>
+                heap_size_of_self_and_children(HTMLUnknownElementCast::to_ref(target).unwrap()),
+        EventTargetTypeId::WebSocket => 0,
+        EventTargetTypeId::Worker => 0,
+        EventTargetTypeId::FileReader => 0,
+        EventTargetTypeId::WorkerGlobalScope(_) => 0,
+        EventTargetTypeId::XMLHttpRequestEventTarget(_) => 0,
+        EventTargetTypeId::Node(NodeTypeId::DocumentType) =>
             heap_size_of_self_and_children(DocumentTypeCast::to_ref(target).unwrap()),
-        &EventTargetTypeId::Node(NodeTypeId::DocumentFragment) =>
+        EventTargetTypeId::Node(NodeTypeId::DocumentFragment) =>
             heap_size_of_self_and_children(DocumentFragmentCast::to_ref(target).unwrap()),
     }
 }
diff --git a/components/util/taskpool.rs b/components/util/taskpool.rs
index 1784c9fb63b..501faa6af0f 100644
--- a/components/util/taskpool.rs
+++ b/components/util/taskpool.rs
@@ -41,12 +41,8 @@ impl TaskPool {
         return TaskPool { tx: tx };
 
         fn worker(rx: &Mutex<Receiver<Box<FnBox() + Send + 'static>>>) {
-            loop {
-                let job = rx.lock().unwrap().recv();
-                match job {
-                    Ok(job) => job.call_box(()),
-                    Err(..) => break,
-                }
+            while let Ok(job) = rx.lock().unwrap().recv() {
+                job.call_box(());
             }
         }
     }