1 files changed, 9 insertions, 19 deletions
diff --git a/components/script/dom/htmlformelement.rs b/components/script/dom/htmlformelement.rs
index b5ca5308c4d..07a2d0e5f50 100644
--- a/components/script/dom/htmlformelement.rs
+++ b/components/script/dom/htmlformelement.rs
@@ -18,16 +18,14 @@ use dom::bindings::codegen::InheritTypes::HTMLInputElementCast;
 use dom::bindings::codegen::InheritTypes::{HTMLTextAreaElementCast, NodeCast};
 use dom::bindings::global::GlobalRef;
 use dom::bindings::js::{Root};
-use dom::document::{Document, DocumentHelpers};
-use dom::element::ElementTypeId;
-use dom::element::{Element, AttributeHandlers};
-use dom::event::{Event, EventHelpers, EventBubbles, EventCancelable};
+use dom::document::Document;
+use dom::element::{Element, ElementTypeId};
+use dom::event::{Event, EventBubbles, EventCancelable};
 use dom::eventtarget::{EventTarget, EventTargetTypeId};
 use dom::htmlbuttonelement::{HTMLButtonElement};
 use dom::htmlelement::{HTMLElement, HTMLElementTypeId};
-use dom::htmlinputelement::{HTMLInputElement, HTMLInputElementHelpers};
-use dom::htmltextareaelement::HTMLTextAreaElementHelpers;
-use dom::node::{Node, NodeHelpers, NodeTypeId, document_from_node, window_from_node};
+use dom::htmlinputelement::HTMLInputElement;
+use dom::node::{Node, NodeTypeId, document_from_node, window_from_node};
 use dom::virtualmethods::VirtualMethods;
 use hyper::header::ContentType;
 use hyper::method::Method;
@@ -161,17 +159,9 @@ pub enum ResetFrom {
     NotFromFormResetMethod
 }
 
-pub trait HTMLFormElementHelpers {
-    // https://html.spec.whatwg.org/multipage/#concept-form-submit
-    fn submit(self, submit_method_flag: SubmittedFrom, submitter: FormSubmitter);
-    // https://html.spec.whatwg.org/multipage/#constructing-the-form-data-set
-    fn get_form_dataset(self, submitter: Option<FormSubmitter>) -> Vec<FormDatum>;
-    // https://html.spec.whatwg.org/multipage/#dom-form-reset
-    fn reset(self, submit_method_flag: ResetFrom);
-}
 
-impl<'a> HTMLFormElementHelpers for &'a HTMLFormElement {
-    fn submit(self, _submit_method_flag: SubmittedFrom, submitter: FormSubmitter) {
+impl HTMLFormElement {
+    pub fn submit(&self, _submit_method_flag: SubmittedFrom, submitter: FormSubmitter) {
         // Step 1
         let doc = document_from_node(self);
         let win = window_from_node(self);
@@ -235,7 +225,7 @@ impl<'a> HTMLFormElementHelpers for &'a HTMLFormElement {
             win.r().pipeline(), load_data)).unwrap();
     }
 
-    fn get_form_dataset<'b>(self, submitter: Option<FormSubmitter<'b>>) -> Vec<FormDatum> {
+    pub fn get_form_dataset<'b>(&self, submitter: Option<FormSubmitter<'b>>) -> Vec<FormDatum> {
         fn clean_crlf(s: &str) -> DOMString {
             // https://html.spec.whatwg.org/multipage/#constructing-the-form-data-set
             // Step 4
@@ -362,7 +352,7 @@ impl<'a> HTMLFormElementHelpers for &'a HTMLFormElement {
         ret
     }
 
-    fn reset(self, _reset_method_flag: ResetFrom) {
+    pub fn reset(&self, _reset_method_flag: ResetFrom) {
         // https://html.spec.whatwg.org/multipage/#locked-for-reset
         if self.marked_for_reset.get() {
             return;