1 files changed, 4 insertions, 6 deletions
diff --git a/components/script/dom/htmlformelement.rs b/components/script/dom/htmlformelement.rs
index 90abdbafefd..a0a34b081c8 100755
--- a/components/script/dom/htmlformelement.rs
+++ b/components/script/dom/htmlformelement.rs
@@ -13,7 +13,7 @@ use dom::bindings::codegen::Bindings::HTMLInputElementBinding::HTMLInputElementM
 use dom::bindings::codegen::Bindings::HTMLTextAreaElementBinding::HTMLTextAreaElementMethods;
 use dom::bindings::conversions::DerivedFrom;
 use dom::bindings::inheritance::{Castable, ElementTypeId, HTMLElementTypeId, NodeTypeId};
-use dom::bindings::js::{JS, MutNullableHeap, Root};
+use dom::bindings::js::{MutNullableJS, Root};
 use dom::bindings::refcounted::Trusted;
 use dom::bindings::reflector::DomObject;
 use dom::bindings::str::DOMString;
@@ -61,7 +61,7 @@ pub struct GenerationId(u32);
 pub struct HTMLFormElement {
     htmlelement: HTMLElement,
     marked_for_reset: Cell<bool>,
-    elements: MutNullableHeap<JS<HTMLFormControlsCollection>>,
+    elements: MutNullableJS<HTMLFormControlsCollection>,
     generation_id: Cell<GenerationId>
 }
 
@@ -85,10 +85,6 @@ impl HTMLFormElement {
                            document,
                            HTMLFormElementBinding::Wrap)
     }
-
-    pub fn generation_id(&self) -> GenerationId {
-        self.generation_id.get()
-    }
 }
 
 impl HTMLFormElementMethods for HTMLFormElement {
@@ -662,6 +658,7 @@ impl HTMLFormElement {
 
 #[derive(JSTraceable, HeapSizeOf, Clone)]
 pub enum FormDatumValue {
+    #[allow(dead_code)]
     File(Root<File>),
     String(DOMString)
 }
@@ -701,6 +698,7 @@ pub enum FormMethod {
 }
 
 #[derive(HeapSizeOf)]
+#[allow(dead_code)]
 pub enum FormSubmittableElement {
     ButtonElement(Root<HTMLButtonElement>),
     InputElement(Root<HTMLInputElement>),