From a5aed43cd865a59b721bb13d97aa5baac682b4f1 Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Mon, 10 Oct 2016 19:42:01 -0700
Subject: [PATCH] Fix bindings.rs warnings.

MozReview-Commit-ID: G03MWTQMkWt
---
 components/style/binding_tools/regen.py     | 12 +++++-------
 components/style/gecko_bindings/bindings.rs |  6 ------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/components/style/binding_tools/regen.py b/components/style/binding_tools/regen.py
index fac8662e83b..be904f10a4d 100755
--- a/components/style/binding_tools/regen.py
+++ b/components/style/binding_tools/regen.py
@@ -195,9 +195,7 @@ COMPILATION_TARGETS = {
     # Generation of the ffi bindings.
     "bindings": {
         "target_dir": "../gecko_bindings",
-        "raw_lines": [
-            "use heapsize::HeapSizeOf;",
-        ],
+        "raw_lines": [],
         "flags": [
             "--ignore-methods",
         ],
@@ -224,13 +222,13 @@ COMPILATION_TARGETS = {
             "nsStyleImageLayers_Layer", "nsStyleImageLayers_LayerType",
             "nsStyleUnit", "nsStyleUnion", "nsStyleCoord_CalcValue",
             "nsStyleCoord_Calc", "nsRestyleHint", "ServoElementSnapshot",
-            "nsChangeHint", "SheetParsingMode", "nsMainThreadPtrHandle",
-            "nsMainThreadPtrHolder", "nscolor", "nsFont", "FontFamilyList",
+            "nsChangeHint", "SheetParsingMode",
+            "nsMainThreadPtrHolder", "nsFont", "FontFamilyList",
             "FontFamilyType", "nsIAtom", "nsStyleContext", "StyleClipPath",
             "StyleBasicShapeType", "StyleBasicShape", "nsCSSShadowArray",
-            "nsINode", "nsIDocument", "nsIPrincipal", "nsIURI",
+            "nsIPrincipal", "nsIURI",
             "RawGeckoNode", "RawGeckoElement", "RawGeckoDocument",
-            "ServoNodeData", "nsString"
+            "nsString"
         ],
         "servo_nullable_arc_types": [
             "ServoComputedValues", "RawServoStyleSheet",
diff --git a/components/style/gecko_bindings/bindings.rs b/components/style/gecko_bindings/bindings.rs
index 4906c1b3ba5..ea4e12305c3 100644
--- a/components/style/gecko_bindings/bindings.rs
+++ b/components/style/gecko_bindings/bindings.rs
@@ -1,6 +1,5 @@
 /* automatically generated by rust-bindgen */
 
-use heapsize::HeapSizeOf;
 pub type ServoComputedValuesStrong = ::gecko_bindings::sugar::ownership::Strong<ServoComputedValues>;
 pub type ServoComputedValuesBorrowedOrNull<'a> = Option<&'a ServoComputedValues>;
 pub type ServoComputedValuesBorrowed<'a> = &'a ServoComputedValues;
@@ -147,9 +146,7 @@ use gecko_bindings::structs::nsRestyleHint;
 use gecko_bindings::structs::ServoElementSnapshot;
 use gecko_bindings::structs::nsChangeHint;
 use gecko_bindings::structs::SheetParsingMode;
-use gecko_bindings::structs::nsMainThreadPtrHandle;
 use gecko_bindings::structs::nsMainThreadPtrHolder;
-use gecko_bindings::structs::nscolor;
 use gecko_bindings::structs::nsFont;
 use gecko_bindings::structs::FontFamilyList;
 use gecko_bindings::structs::FontFamilyType;
@@ -161,14 +158,11 @@ use gecko_bindings::structs::StyleClipPath;
 use gecko_bindings::structs::StyleBasicShapeType;
 use gecko_bindings::structs::StyleBasicShape;
 use gecko_bindings::structs::nsCSSShadowArray;
-use gecko_bindings::structs::nsINode;
-use gecko_bindings::structs::nsIDocument;
 use gecko_bindings::structs::nsIPrincipal;
 use gecko_bindings::structs::nsIURI;
 use gecko_bindings::structs::RawGeckoNode;
 use gecko_bindings::structs::RawGeckoElement;
 use gecko_bindings::structs::RawGeckoDocument;
-use gecko_bindings::structs::ServoNodeData;
 use gecko_bindings::structs::nsString;
 
 extern "C" {