From 8458798f2d17becf5f8b10f2f297f932d2865efe Mon Sep 17 00:00:00 2001
From: Michael Wu <mwu@mozilla.com>
Date: Sat, 31 Oct 2015 01:00:25 +0501
Subject: [PATCH] servo: Merge #8273 - Minor cleanups for DOM (from
 michaelwu:cleanups); r=jdm

Source-Repo: https://github.com/servo/servo
Source-Revision: c887aaf6943c3945aed391e6fbbc23c709a4517f
---
 servo/components/script/dom/cssstyledeclaration.rs | 2 +-
 servo/components/script/dom/element.rs             | 8 ++++----
 servo/components/script/dom/event.rs               | 6 +++---
 servo/components/script/dom/xmlhttprequest.rs      | 5 ++---
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/servo/components/script/dom/cssstyledeclaration.rs b/servo/components/script/dom/cssstyledeclaration.rs
index ba6923c1f6f75..f4ab910e91316 100644
--- a/servo/components/script/dom/cssstyledeclaration.rs
+++ b/servo/components/script/dom/cssstyledeclaration.rs
@@ -60,8 +60,8 @@ impl CSSStyleDeclaration {
         CSSStyleDeclaration {
             reflector_: Reflector::new(),
             owner: JS::from_ref(owner),
-            pseudo: pseudo,
             readonly: modification_access == CSSModificationAccess::Readonly,
+            pseudo: pseudo,
         }
     }
 
diff --git a/servo/components/script/dom/element.rs b/servo/components/script/dom/element.rs
index 0bdca0714a7ea..d2636820362c3 100644
--- a/servo/components/script/dom/element.rs
+++ b/servo/components/script/dom/element.rs
@@ -155,10 +155,10 @@ impl Element {
             namespace: namespace,
             prefix: prefix,
             attrs: DOMRefCell::new(vec!()),
-            attr_list: Default::default(),
-            class_list: Default::default(),
             id_attribute: DOMRefCell::new(None),
             style_attribute: DOMRefCell::new(None),
+            attr_list: Default::default(),
+            class_list: Default::default(),
             event_state: Cell::new(state),
         }
     }
@@ -189,7 +189,7 @@ pub unsafe fn get_attr_for_layout<'a>(elem: &'a Element, namespace: &Namespace,
                                       -> Option<LayoutJS<Attr>> {
     // cast to point to T in RefCell<T> directly
     let attrs = elem.attrs.borrow_for_layout();
-    attrs.iter().find(|attr: & &JS<Attr>| {
+    attrs.iter().find(|attr| {
         let attr = attr.to_layout();
         *name == attr.local_name_atom_forever() &&
         (*attr.unsafe_get()).namespace() == namespace
@@ -216,7 +216,7 @@ impl RawLayoutElementHelpers for Element {
     #[inline]
     unsafe fn get_attr_vals_for_layout<'a>(&'a self, name: &Atom) -> Vec<&'a str> {
         let attrs = self.attrs.borrow_for_layout();
-        (*attrs).iter().filter_map(|attr: &JS<Attr>| {
+        attrs.iter().filter_map(|attr| {
             let attr = attr.to_layout();
             if *name == attr.local_name_atom_forever() {
               Some(attr.value_ref_forever())
diff --git a/servo/components/script/dom/event.rs b/servo/components/script/dom/event.rs
index 6b63b3a58ee1d..c56d44e15c37e 100644
--- a/servo/components/script/dom/event.rs
+++ b/servo/components/script/dom/event.rs
@@ -62,15 +62,15 @@ impl Event {
             reflector_: Reflector::new(),
             current_target: Default::default(),
             target: Default::default(),
-            phase: Cell::new(EventPhase::None),
             type_: DOMRefCell::new("".to_owned()),
+            phase: Cell::new(EventPhase::None),
             canceled: Cell::new(false),
+            stop_propagation: Cell::new(false),
+            stop_immediate: Cell::new(false),
             cancelable: Cell::new(false),
             bubbles: Cell::new(false),
             trusted: Cell::new(false),
             dispatching: Cell::new(false),
-            stop_propagation: Cell::new(false),
-            stop_immediate: Cell::new(false),
             initialized: Cell::new(false),
             timestamp: time::get_time().sec as u64,
         }
diff --git a/servo/components/script/dom/xmlhttprequest.rs b/servo/components/script/dom/xmlhttprequest.rs
index 6bf36809ff626..39b86117b34ff 100644
--- a/servo/components/script/dom/xmlhttprequest.rs
+++ b/servo/components/script/dom/xmlhttprequest.rs
@@ -163,10 +163,9 @@ impl XMLHttpRequest {
             request_headers: DOMRefCell::new(Headers::new()),
             request_body_len: Cell::new(0),
             sync: Cell::new(false),
-            send_flag: Cell::new(false),
-
             upload_complete: Cell::new(false),
             upload_events: Cell::new(false),
+            send_flag: Cell::new(false),
 
             global: GlobalField::from_rooted(&global),
             timeout_cancel: DOMRefCell::new(None),
@@ -881,7 +880,7 @@ impl XMLHttpRequest {
                     _ => "error",
                 };
 
-                let upload_complete: &Cell<bool> = &self.upload_complete;
+                let upload_complete = &self.upload_complete;
                 if !upload_complete.get() {
                     upload_complete.set(true);
                     self.dispatch_upload_progress_event("progress".to_owned(), None);