diff --git a/components/msg/constellation_msg.rs b/components/msg/constellation_msg.rs
index a147842db25..d60f45b8b0e 100644
--- a/components/msg/constellation_msg.rs
+++ b/components/msg/constellation_msg.rs
@@ -262,7 +262,8 @@ pub enum MozBrowserEvent {
     AsyncScroll,
     /// Sent when window.close() is called within a browser <iframe>.
     Close,
-    /// Sent when a browser <iframe> tries to open a context menu. This allows  handling <menuitem> element available within the browser <iframe>'s content.
+    /// Sent when a browser <iframe> tries to open a context menu. This allows
+    /// handling <menuitem> element available within the browser <iframe>'s content.
     ContextMenu,
     /// Sent when an error occurred while trying to load content within a browser <iframe>.
     Error,
diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs
index 86a882dbb86..fbd12be244c 100644
--- a/components/script/dom/htmlmediaelement.rs
+++ b/components/script/dom/htmlmediaelement.rs
@@ -26,7 +26,9 @@ impl HTMLMediaElementDerived for EventTarget {
 }
 
 impl HTMLMediaElement {
-    pub fn new_inherited(type_id: HTMLMediaElementTypeId, tag_name: DOMString, prefix: Option<DOMString>, document: JSRef<Document>) -> HTMLMediaElement {
+    pub fn new_inherited(type_id: HTMLMediaElementTypeId, tag_name: DOMString,
+                         prefix: Option<DOMString>, document: JSRef<Document>)
+                         -> HTMLMediaElement {
         HTMLMediaElement {
             htmlelement: HTMLElement::new_inherited(HTMLElementTypeId::HTMLMediaElement(type_id), tag_name, prefix, document)
         }
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
index 90aaa524d05..f7401c99b11 100644
--- a/components/script/dom/node.rs
+++ b/components/script/dom/node.rs
@@ -2234,13 +2234,18 @@ impl<'a> NodeMethods for JSRef<'a, Node> {
 
             match node.type_id() {
                 // Step 3.
-                NodeTypeId::DocumentType if !is_equal_doctype(this, node) => return false,
-                NodeTypeId::Element(..) if !is_equal_element(this, node) => return false,
-                NodeTypeId::CharacterData(CharacterDataTypeId::ProcessingInstruction) if !is_equal_processinginstruction(this, node) => return false,
+                NodeTypeId::DocumentType
+                    if !is_equal_doctype(this, node) => return false,
+                NodeTypeId::Element(..)
+                    if !is_equal_element(this, node) => return false,
+                NodeTypeId::CharacterData(CharacterDataTypeId::ProcessingInstruction)
+                    if !is_equal_processinginstruction(this, node) => return false,
                 NodeTypeId::CharacterData(CharacterDataTypeId::Text) |
-                NodeTypeId::CharacterData(CharacterDataTypeId::Comment) if !is_equal_characterdata(this, node) => return false,
+                NodeTypeId::CharacterData(CharacterDataTypeId::Comment)
+                    if !is_equal_characterdata(this, node) => return false,
                 // Step 4.
-                NodeTypeId::Element(..) if !is_equal_element_attrs(this, node) => return false,
+                NodeTypeId::Element(..)
+                    if !is_equal_element_attrs(this, node) => return false,
                 _ => ()
             }
 
diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs
index 0b7673d828b..009ca43a78b 100644
--- a/components/script/dom/websocket.rs
+++ b/components/script/dom/websocket.rs
@@ -156,7 +156,8 @@ impl<'a> WebSocketMethods for JSRef<'a, WebSocket> {
     fn Send(self, data: Option<DOMString>)-> Fallible<()>{
         /*TODO: This is not up to spec see http://html.spec.whatwg.org/multipage/comms.html search for "If argument is a string"
           TODO: Need to buffer data
-          TODO: bufferedAmount attribute returns the size of the buffer in bytes - this is a required attribute defined in the websocket.webidle file
+          TODO: bufferedAmount attribute returns the size of the buffer in bytes -
+                this is a required attribute defined in the websocket.webidl file
           TODO: The send function needs to flag when full by using the following
           self.full.set(true). This needs to be done when the buffer is full
         */
diff --git a/ports/gonk/src/window.rs b/ports/gonk/src/window.rs
index 281b3cbc462..a718123e6de 100644
--- a/ports/gonk/src/window.rs
+++ b/ports/gonk/src/window.rs
@@ -399,8 +399,12 @@ extern fn set_usage(window: *mut GonkNativeWindow,
     println!("Setting usage flags to {}", usage);
     unsafe {
         (*window).usage = usage;
-        (*window).bufs[0] = Some(GonkNativeWindowBuffer::new((*window).alloc_dev, (*window).width, (*window).height, (*window).format, (*window).usage));
-        (*window).bufs[1] = Some(GonkNativeWindowBuffer::new((*window).alloc_dev, (*window).width, (*window).height, (*window).format, (*window).usage));
+        (*window).bufs[0] = Some(GonkNativeWindowBuffer::new(
+            (*window).alloc_dev, (*window).width, (*window).height,
+            (*window).format, (*window).usage));
+        (*window).bufs[1] = Some(GonkNativeWindowBuffer::new(
+            (*window).alloc_dev, (*window).width, (*window).height,
+            (*window).format, (*window).usage));
     }
     0
 }
diff --git a/python/tidy.py b/python/tidy.py
index 780cfca647e..5191a8921b8 100644
--- a/python/tidy.py
+++ b/python/tidy.py
@@ -68,7 +68,7 @@ def check_license(contents):
 
 
 def check_length(idx, line):
-    if len(line) >= 160:
+    if len(line) >= 150:
         yield (idx + 1, "(much) overlong line")
 
 def check_whatwg_url(idx, line):
diff --git a/tests/unit/net/data_loader.rs b/tests/unit/net/data_loader.rs
index b641b58d06a..b66d50a41ad 100644
--- a/tests/unit/net/data_loader.rs
+++ b/tests/unit/net/data_loader.rs
@@ -70,12 +70,16 @@ fn base64() {
 #[test]
 fn base64_ct() {
     assert_parse("data:application/octet-stream;base64,C62+7w==",
-        Some(ContentType(Mime(TopLevel::Application, SubLevel::Ext("octet-stream".to_string()), vec!()))), None, Some(vec!(0x0B, 0xAD, 0xBE, 0xEF)));
+        Some(ContentType(Mime(TopLevel::Application, SubLevel::Ext("octet-stream".to_string()), vec!()))),
+        None,
+        Some(vec!(0x0B, 0xAD, 0xBE, 0xEF)));
 }
 
 #[test]
 fn base64_charset() {
     assert_parse("data:text/plain;charset=koi8-r;base64,8PLl9+XkIO3l5Pfl5A==",
-        Some(ContentType(Mime(TopLevel::Text, SubLevel::Plain, vec!((Attr::Charset, Value::Ext("koi8-r".to_string())))))), Some("koi8-r".to_string()),
+        Some(ContentType(Mime(TopLevel::Text, SubLevel::Plain,
+                              vec!((Attr::Charset, Value::Ext("koi8-r".to_string())))))),
+        Some("koi8-r".to_string()),
         Some(vec!(0xF0, 0xF2, 0xE5, 0xF7, 0xE5, 0xE4, 0x20, 0xED, 0xE5, 0xE4, 0xF7, 0xE5, 0xE4)));
 }