diff --git a/servo/components/script/dom/webidls/Attr.webidl b/servo/components/script/dom/webidls/Attr.webidl
index beb4779fe4d0..d14f2f344146 100644
--- a/servo/components/script/dom/webidls/Attr.webidl
+++ b/servo/components/script/dom/webidls/Attr.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * The origin of this IDL file is
  * https://dom.spec.whatwg.org/#interface-attr
  *
diff --git a/servo/components/script/dom/webidls/Blob.webidl b/servo/components/script/dom/webidls/Blob.webidl
index 6d91f65b1f52..3b377a938d62 100644
--- a/servo/components/script/dom/webidls/Blob.webidl
+++ b/servo/components/script/dom/webidls/Blob.webidl
@@ -5,7 +5,8 @@
 
 // http://dev.w3.org/2006/webapi/FileAPI/#dfn-Blob
 //[Exposed=Window,Worker][Constructor,
-// Constructor(sequence<(ArrayBuffer or ArrayBufferView or Blob or DOMString)> blobParts, optional BlobPropertyBag options)]
+// Constructor(sequence<(ArrayBuffer or ArrayBufferView or Blob or DOMString)> blobParts,
+//             optional BlobPropertyBag options)]
 [Constructor,
  Constructor(DOMString blobParts, optional BlobPropertyBag options)]
 interface Blob {
diff --git a/servo/components/script/dom/webidls/BrowserElement.webidl b/servo/components/script/dom/webidls/BrowserElement.webidl
index e719a3b9bbbe..ad748884f9ff 100644
--- a/servo/components/script/dom/webidls/BrowserElement.webidl
+++ b/servo/components/script/dom/webidls/BrowserElement.webidl
@@ -1,8 +1,7 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- */
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // https://developer.mozilla.org/en-US/docs/Web/API/Using_the_Browser_API
 
diff --git a/servo/components/script/dom/webidls/CSS.webidl b/servo/components/script/dom/webidls/CSS.webidl
index 59832c0af153..4ad2f07d893b 100644
--- a/servo/components/script/dom/webidls/CSS.webidl
+++ b/servo/components/script/dom/webidls/CSS.webidl
@@ -1,7 +1,7 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * The origin of this IDL file is
  * http://dev.w3.org/csswg/cssom/#the-css-interface
  */
diff --git a/servo/components/script/dom/webidls/CSSStyleDeclaration.webidl b/servo/components/script/dom/webidls/CSSStyleDeclaration.webidl
index 63220ad1ecd1..16fc0c63a6a3 100644
--- a/servo/components/script/dom/webidls/CSSStyleDeclaration.webidl
+++ b/servo/components/script/dom/webidls/CSSStyleDeclaration.webidl
@@ -1,7 +1,7 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * The origin of this IDL file is
  * http://dev.w3.org/csswg/cssom/#the-cssstyledeclaration-interface
  *
diff --git a/servo/components/script/dom/webidls/CanvasRenderingContext2D.webidl b/servo/components/script/dom/webidls/CanvasRenderingContext2D.webidl
index c1fa7dae4b7c..b2e1c51e9f59 100644
--- a/servo/components/script/dom/webidls/CanvasRenderingContext2D.webidl
+++ b/servo/components/script/dom/webidls/CanvasRenderingContext2D.webidl
@@ -94,14 +94,18 @@ interface CanvasRenderingContext2D {
   void clip(optional CanvasWindingRule fillRule = "nonzero");
   //void clip(Path2D path, optional CanvasWindingRule fillRule = "nonzero");
   //void resetClip();
-  //boolean isPointInPath(unrestricted double x, unrestricted double y, optional CanvasWindingRule fillRule = "nonzero");
-  //boolean isPointInPath(Path2D path, unrestricted double x, unrestricted double y, optional CanvasWindingRule fillRule = "nonzero");
+  //boolean isPointInPath(unrestricted double x, unrestricted double y,
+  //                      optional CanvasWindingRule fillRule = "nonzero");
+  //boolean isPointInPath(Path2D path, unrestricted double x, unrestricted double y,
+  //                      optional CanvasWindingRule fillRule = "nonzero");
   //boolean isPointInStroke(unrestricted double x, unrestricted double y);
   //boolean isPointInStroke(Path2D path, unrestricted double x, unrestricted double y);
 
   // text (see also the CanvasDrawingStyles interface)
-  //void fillText(DOMString text, unrestricted double x, unrestricted double y, optional unrestricted double maxWidth);
-  //void strokeText(DOMString text, unrestricted double x, unrestricted double y, optional unrestricted double maxWidth);
+  //void fillText(DOMString text, unrestricted double x, unrestricted double y,
+  //              optional unrestricted double maxWidth);
+  //void strokeText(DOMString text, unrestricted double x, unrestricted double y,
+  //                optional unrestricted double maxWidth);
   //TextMetrics measureText(DOMString text);
 
   // drawing images
@@ -128,7 +132,10 @@ interface CanvasRenderingContext2D {
   [Throws]
   ImageData getImageData(double sx, double sy, double sw, double sh);
   void putImageData(ImageData imagedata, double dx, double dy);
-  void putImageData(ImageData imagedata, double dx, double dy, double dirtyX, double dirtyY, double dirtyWidth, double dirtyHeight);
+  void putImageData(ImageData imagedata,
+                    double dx, double dy,
+                    double dirtyX, double dirtyY,
+                    double dirtyWidth, double dirtyHeight);
 };
 
 [NoInterfaceObject]
@@ -147,7 +154,8 @@ interface CanvasDrawingStyles {
   // text
   //attribute DOMString font; // (default 10px sans-serif)
   //attribute DOMString textAlign; // "start", "end", "left", "right", "center" (default: "start")
-  //attribute DOMString textBaseline; // "top", "hanging", "middle", "alphabetic", "ideographic", "bottom" (default: "alphabetic")
+  //attribute DOMString textBaseline; // "top", "hanging", "middle", "alphabetic",
+                                      // "ideographic", "bottom" (default: "alphabetic")
   //attribute DOMString direction; // "ltr", "rtl", "inherit" (default: "inherit")
 };
 
@@ -157,7 +165,8 @@ interface CanvasPathMethods {
   void closePath();
   void moveTo(unrestricted double x, unrestricted double y);
   void lineTo(unrestricted double x, unrestricted double y);
-  void quadraticCurveTo(unrestricted double cpx, unrestricted double cpy, unrestricted double x, unrestricted double y);
+  void quadraticCurveTo(unrestricted double cpx, unrestricted double cpy,
+                        unrestricted double x, unrestricted double y);
 
   void bezierCurveTo(unrestricted double cp1x,
                      unrestricted double cp1y,
@@ -170,16 +179,19 @@ interface CanvasPathMethods {
   void arcTo(unrestricted double x1, unrestricted double y1,
              unrestricted double x2, unrestricted double y2,
              unrestricted double radius);
-// NOT IMPLEMENTED  [LenientFloat] void arcTo(double x1, double y1, double x2, double y2, double radiusX, double radiusY, double rotation);
+  // [LenientFloat] void arcTo(double x1, double y1, double x2, double y2,
+  //                           double radiusX, double radiusY, double rotation);
 
   void rect(unrestricted double x, unrestricted double y, unrestricted double w, unrestricted double h);
 
   [Throws]
-  void arc(double x, double y, double radius, double startAngle, double endAngle, optional boolean anticlockwise = false);
-// NOT IMPLEMENTED  [LenientFloat] void ellipse(double x, double y, double radiusX, double radiusY, double rotation, double startAngle, double endAngle, boolean anticlockwise);
+  void arc(double x, double y, double radius, double startAngle, double endAngle,
+           optional boolean anticlockwise = false);
+  // [LenientFloat] void ellipse(double x, double y, double radiusX, double radiusY,
+  //                             double rotation, double startAngle, double endAngle,
+  //                             boolean anticlockwise);
 };
 
 
 CanvasRenderingContext2D implements CanvasDrawingStyles;
 CanvasRenderingContext2D implements CanvasPathMethods;
-
diff --git a/servo/components/script/dom/webidls/CharacterData.webidl b/servo/components/script/dom/webidls/CharacterData.webidl
index 470263c51b23..b22d755438f5 100644
--- a/servo/components/script/dom/webidls/CharacterData.webidl
+++ b/servo/components/script/dom/webidls/CharacterData.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * The origin of this IDL file is
  * https://dom.spec.whatwg.org/#characterdata
  *
diff --git a/servo/components/script/dom/webidls/ChildNode.webidl b/servo/components/script/dom/webidls/ChildNode.webidl
index 7205d08b05e3..bf52c4d90b55 100644
--- a/servo/components/script/dom/webidls/ChildNode.webidl
+++ b/servo/components/script/dom/webidls/ChildNode.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * The origin of this IDL file is:
  * https://dom.spec.whatwg.org/#interface-childnode
  */
diff --git a/servo/components/script/dom/webidls/Comment.webidl b/servo/components/script/dom/webidls/Comment.webidl
index 6def109ef124..cd18988a8ace 100644
--- a/servo/components/script/dom/webidls/Comment.webidl
+++ b/servo/components/script/dom/webidls/Comment.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * The origin of this IDL file is
  * https://dom.spec.whatwg.org/#comment
  *
diff --git a/servo/components/script/dom/webidls/Console.webidl b/servo/components/script/dom/webidls/Console.webidl
index 6a2b89f90de1..6d0c67ef048f 100644
--- a/servo/components/script/dom/webidls/Console.webidl
+++ b/servo/components/script/dom/webidls/Console.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * References:
  *   MDN Docs - https://developer.mozilla.org/en-US/docs/Web/API/console
  *   Draft Spec - https://sideshowbarker.github.io/console-spec/
diff --git a/servo/components/script/dom/webidls/Crypto.webidl b/servo/components/script/dom/webidls/Crypto.webidl
index 032fce382bba..d0d7c4303d7b 100644
--- a/servo/components/script/dom/webidls/Crypto.webidl
+++ b/servo/components/script/dom/webidls/Crypto.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * The origin of this IDL file is
  * https://dvcs.w3.org/hg/webcrypto-api/raw-file/tip/spec/Overview.html#crypto-interface
  *
diff --git a/servo/components/script/dom/webidls/CustomEvent.webidl b/servo/components/script/dom/webidls/CustomEvent.webidl
index da8849bf82ec..1fa0f50b7e84 100644
--- a/servo/components/script/dom/webidls/CustomEvent.webidl
+++ b/servo/components/script/dom/webidls/CustomEvent.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * For more information on this interface please see
  * https://dom.spec.whatwg.org/#interface-customevent
  *
diff --git a/servo/components/script/dom/webidls/DOMException.webidl b/servo/components/script/dom/webidls/DOMException.webidl
index da135df192f7..7c09054598c7 100644
--- a/servo/components/script/dom/webidls/DOMException.webidl
+++ b/servo/components/script/dom/webidls/DOMException.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * The origin of this IDL file is:
  * https://dom.spec.whatwg.org/#domexception
  */
diff --git a/servo/components/script/dom/webidls/DOMImplementation.webidl b/servo/components/script/dom/webidls/DOMImplementation.webidl
index a5c8c4392a71..98b90a296308 100644
--- a/servo/components/script/dom/webidls/DOMImplementation.webidl
+++ b/servo/components/script/dom/webidls/DOMImplementation.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * The origin of this IDL file is
  * https://dom.spec.whatwg.org/#interface=domimplementation
  *
diff --git a/servo/components/script/dom/webidls/DOMParser.webidl b/servo/components/script/dom/webidls/DOMParser.webidl
index e8ce5f6915b0..9df194706b9c 100644
--- a/servo/components/script/dom/webidls/DOMParser.webidl
+++ b/servo/components/script/dom/webidls/DOMParser.webidl
@@ -1,7 +1,7 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * The origin of this IDL file is
  * https://domparsing.spec.whatwg.org/#the-domparser-interface
  */
diff --git a/servo/components/script/dom/webidls/DOMPoint.webidl b/servo/components/script/dom/webidls/DOMPoint.webidl
index 6903ff994587..f3b9d8cd3c5f 100644
--- a/servo/components/script/dom/webidls/DOMPoint.webidl
+++ b/servo/components/script/dom/webidls/DOMPoint.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * The origin of this IDL file is
  * http://dev.w3.org/fxtf/geometry/
  *
diff --git a/servo/components/script/dom/webidls/DOMPointReadOnly.webidl b/servo/components/script/dom/webidls/DOMPointReadOnly.webidl
index 6bff491a58c3..cab781a2f973 100644
--- a/servo/components/script/dom/webidls/DOMPointReadOnly.webidl
+++ b/servo/components/script/dom/webidls/DOMPointReadOnly.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * The origin of this IDL file is
  * http://dev.w3.org/fxtf/geometry/
  *
diff --git a/servo/components/script/dom/webidls/Document.webidl b/servo/components/script/dom/webidls/Document.webidl
index 687650a6c3a2..786d87aef287 100644
--- a/servo/components/script/dom/webidls/Document.webidl
+++ b/servo/components/script/dom/webidls/Document.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * The origin of this IDL file is:
  * https://dom.spec.whatwg.org/#interface-document
  * https://www.whatwg.org/specs/web-apps/current-work/#the-document-object
@@ -59,9 +59,11 @@ interface Document : Node {
 
   // NodeFilter.SHOW_ALL = 0xFFFFFFFF
   [NewObject]
-  NodeIterator createNodeIterator(Node root, optional unsigned long whatToShow = 0xFFFFFFFF, optional NodeFilter? filter = null);
+  NodeIterator createNodeIterator(Node root, optional unsigned long whatToShow = 0xFFFFFFFF,
+                                  optional NodeFilter? filter = null);
   [NewObject]
-  TreeWalker createTreeWalker(Node root, optional unsigned long whatToShow = 0xFFFFFFFF, optional NodeFilter? filter = null);
+  TreeWalker createTreeWalker(Node root, optional unsigned long whatToShow = 0xFFFFFFFF,
+                              optional NodeFilter? filter = null);
 };
 Document implements ParentNode;
 
diff --git a/servo/components/script/dom/webidls/DocumentType.webidl b/servo/components/script/dom/webidls/DocumentType.webidl
index 86b7c3a79192..e59faa1a026c 100644
--- a/servo/components/script/dom/webidls/DocumentType.webidl
+++ b/servo/components/script/dom/webidls/DocumentType.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * The origin of this IDL file is
  * https://dom.spec.whatwg.org/#documenttype
  *
diff --git a/servo/components/script/dom/webidls/Element.webidl b/servo/components/script/dom/webidls/Element.webidl
index cbaf599d25eb..81c6f329b47a 100644
--- a/servo/components/script/dom/webidls/Element.webidl
+++ b/servo/components/script/dom/webidls/Element.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * The origin of this IDL file is
  * https://dom.spec.whatwg.org/#element and
  * https://domparsing.spec.whatwg.org/ and
diff --git a/servo/components/script/dom/webidls/ErrorEvent.webidl b/servo/components/script/dom/webidls/ErrorEvent.webidl
index e56b70ebb1db..4772fd3e9c40 100644
--- a/servo/components/script/dom/webidls/ErrorEvent.webidl
+++ b/servo/components/script/dom/webidls/ErrorEvent.webidl
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-// https://html.spec.whatwg.org/multipage/#the-errorevent-interface 
+// https://html.spec.whatwg.org/multipage/#the-errorevent-interface
 
 [Constructor(DOMString type, optional ErrorEventInit eventInitDict)/*, Exposed=(Window,Worker)*/]
 interface ErrorEvent : Event {
diff --git a/servo/components/script/dom/webidls/Event.webidl b/servo/components/script/dom/webidls/Event.webidl
index f71ab52cb5ec..a8090d68ae33 100644
--- a/servo/components/script/dom/webidls/Event.webidl
+++ b/servo/components/script/dom/webidls/Event.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * For more information on this interface please see
  * http://dev.w3.org/2006/webapi/DOM-Level-3-Events/html/DOM3-Events.html
  *
diff --git a/servo/components/script/dom/webidls/EventHandler.webidl b/servo/components/script/dom/webidls/EventHandler.webidl
index c0ee3f290a87..ea388daad924 100644
--- a/servo/components/script/dom/webidls/EventHandler.webidl
+++ b/servo/components/script/dom/webidls/EventHandler.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * The origin of this IDL file is
  * https://www.whatwg.org/specs/web-apps/current-work/#eventhandler
  *
@@ -16,7 +16,9 @@ callback EventHandlerNonNull = any (Event event);
 typedef EventHandlerNonNull? EventHandler;
 
 [TreatNonObjectAsNull]
-callback OnErrorEventHandlerNonNull = boolean ((Event or DOMString) event, optional DOMString source, optional unsigned long lineno, optional unsigned long column, optional any error);
+callback OnErrorEventHandlerNonNull = boolean ((Event or DOMString) event, optional DOMString source,
+                                               optional unsigned long lineno, optional unsigned long column,
+                                               optional any error);
 typedef OnErrorEventHandlerNonNull? OnErrorEventHandler;
 
 [NoInterfaceObject]
diff --git a/servo/components/script/dom/webidls/EventListener.webidl b/servo/components/script/dom/webidls/EventListener.webidl
index 82fe3205d124..d05f69fed1f2 100644
--- a/servo/components/script/dom/webidls/EventListener.webidl
+++ b/servo/components/script/dom/webidls/EventListener.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * https://dom.spec.whatwg.org/#callbackdef-eventlistener
  */
 
diff --git a/servo/components/script/dom/webidls/EventTarget.webidl b/servo/components/script/dom/webidls/EventTarget.webidl
index c5c2150574cb..1bc929851eda 100644
--- a/servo/components/script/dom/webidls/EventTarget.webidl
+++ b/servo/components/script/dom/webidls/EventTarget.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * https://dom.spec.whatwg.org/#interface-eventtarget
  */
 
diff --git a/servo/components/script/dom/webidls/FileReader.webidl b/servo/components/script/dom/webidls/FileReader.webidl
index 0c599348ed7e..9f2b70c78a96 100644
--- a/servo/components/script/dom/webidls/FileReader.webidl
+++ b/servo/components/script/dom/webidls/FileReader.webidl
@@ -1,8 +1,7 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- */
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
  // http://dev.w3.org/2006/webapi/FileAPI/#APIASynch
 
diff --git a/servo/components/script/dom/webidls/FormData.webidl b/servo/components/script/dom/webidls/FormData.webidl
index 2937d5bb9a6b..96eccba673bd 100644
--- a/servo/components/script/dom/webidls/FormData.webidl
+++ b/servo/components/script/dom/webidls/FormData.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * The origin of this IDL file is
  * https://xhr.spec.whatwg.org
  */
diff --git a/servo/components/script/dom/webidls/Function.webidl b/servo/components/script/dom/webidls/Function.webidl
index 93784103a0e1..511563de0d3e 100644
--- a/servo/components/script/dom/webidls/Function.webidl
+++ b/servo/components/script/dom/webidls/Function.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * The origin of this IDL file is
  * https://www.whatwg.org/specs/web-apps/current-work/#functiocn
  *
diff --git a/servo/components/script/dom/webidls/HTMLAnchorElement.webidl b/servo/components/script/dom/webidls/HTMLAnchorElement.webidl
index f144652fb882..7622cc0ceb4f 100644
--- a/servo/components/script/dom/webidls/HTMLAnchorElement.webidl
+++ b/servo/components/script/dom/webidls/HTMLAnchorElement.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * The origin of this IDL file is
  * https://www.whatwg.org/specs/web-apps/current-work/#the-a-element
  * https://www.whatwg.org/specs/web-apps/current-work/#other-elements,-attributes-and-apis
diff --git a/servo/components/script/dom/webidls/HTMLInputElement.webidl b/servo/components/script/dom/webidls/HTMLInputElement.webidl
index 81ff5f97426b..afd605bf6d5e 100644
--- a/servo/components/script/dom/webidls/HTMLInputElement.webidl
+++ b/servo/components/script/dom/webidls/HTMLInputElement.webidl
@@ -64,7 +64,8 @@ interface HTMLInputElement : HTMLElement {
   //         attribute unsigned long selectionEnd;
   //         attribute DOMString selectionDirection;
   //void setRangeText(DOMString replacement);
-  //void setRangeText(DOMString replacement, unsigned long start, unsigned long end, optional SelectionMode selectionMode = "preserve");
+  //void setRangeText(DOMString replacement, unsigned long start, unsigned long end,
+  //                  optional SelectionMode selectionMode = "preserve");
   //void setSelectionRange(unsigned long start, unsigned long end, optional DOMString direction);
 
   // also has obsolete members
diff --git a/servo/components/script/dom/webidls/HTMLOptionElement.webidl b/servo/components/script/dom/webidls/HTMLOptionElement.webidl
index a3493879e5c5..c4f57ab49637 100644
--- a/servo/components/script/dom/webidls/HTMLOptionElement.webidl
+++ b/servo/components/script/dom/webidls/HTMLOptionElement.webidl
@@ -4,7 +4,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // https://www.whatwg.org/html/#htmloptionelement
-//[NamedConstructor=Option(optional DOMString text = "", optional DOMString value, optional boolean defaultSelected = false, optional boolean selected = false)]
+//[NamedConstructor=Option(optional DOMString text = "", optional DOMString value,
+//                         optional boolean defaultSelected = false,
+//                         optional boolean selected = false)]
 interface HTMLOptionElement : HTMLElement {
              attribute boolean disabled;
   //readonly attribute HTMLFormElement? form;
diff --git a/servo/components/script/dom/webidls/HTMLTextAreaElement.webidl b/servo/components/script/dom/webidls/HTMLTextAreaElement.webidl
index fa70cb4d47a2..af73dde6a48b 100644
--- a/servo/components/script/dom/webidls/HTMLTextAreaElement.webidl
+++ b/servo/components/script/dom/webidls/HTMLTextAreaElement.webidl
@@ -42,6 +42,7 @@ interface HTMLTextAreaElement : HTMLElement {
   //         attribute unsigned long selectionEnd;
   //         attribute DOMString selectionDirection;
   //void setRangeText(DOMString replacement);
-  //void setRangeText(DOMString replacement, unsigned long start, unsigned long end, optional SelectionMode selectionMode = "preserve");
+  //void setRangeText(DOMString replacement, unsigned long start, unsigned long end,
+  //                  optional SelectionMode selectionMode = "preserve");
   //void setSelectionRange(unsigned long start, unsigned long end, optional DOMString direction);
 };
diff --git a/servo/components/script/dom/webidls/HTMLUnknownElement.webidl b/servo/components/script/dom/webidls/HTMLUnknownElement.webidl
index dff8a5ac81e0..366d6d366f19 100644
--- a/servo/components/script/dom/webidls/HTMLUnknownElement.webidl
+++ b/servo/components/script/dom/webidls/HTMLUnknownElement.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * The origin of this IDL file is
  * https://www.whatwg.org/specs/web-apps/current-work/ and
  * http://dev.w3.org/csswg/cssom-view/
diff --git a/servo/components/script/dom/webidls/ImageData.webidl b/servo/components/script/dom/webidls/ImageData.webidl
index 0d1207148fc7..93472f4efaa8 100644
--- a/servo/components/script/dom/webidls/ImageData.webidl
+++ b/servo/components/script/dom/webidls/ImageData.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * The origin of this IDL file is
  * https://www.whatwg.org/specs/web-apps/current-work/multipage/the-canvas-element.html#imagedata
  *
@@ -14,10 +14,10 @@
 //Constructor(Uint8ClampedArray data, unsigned long sw, optional unsigned long sh),
 //Exposed=(Window,Worker)]
 interface ImageData {
-	//[Constant]
-	readonly attribute unsigned long width;
-	//[Constant]
-	readonly attribute unsigned long height;
-	//[Constant, StoreInSlot]
-	readonly attribute Uint8ClampedArray data;
+  //[Constant]
+  readonly attribute unsigned long width;
+  //[Constant]
+  readonly attribute unsigned long height;
+  //[Constant, StoreInSlot]
+  readonly attribute Uint8ClampedArray data;
 };
diff --git a/servo/components/script/dom/webidls/KeyboardEvent.webidl b/servo/components/script/dom/webidls/KeyboardEvent.webidl
index d0a185a14de6..3520d509ec60 100644
--- a/servo/components/script/dom/webidls/KeyboardEvent.webidl
+++ b/servo/components/script/dom/webidls/KeyboardEvent.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * The origin of this IDL file is
  * https://dvcs.w3.org/hg/dom3events/raw-file/tip/html/DOM3-Events.html#interface-KeyboardEvent
  *
@@ -30,7 +30,9 @@ interface KeyboardEvent : UIEvent {
 // https://dvcs.w3.org/hg/dom3events/raw-file/tip/html/DOM3-Events.html#idl-interface-KeyboardEvent-initializers
 partial interface KeyboardEvent {
     // Originally introduced (and deprecated) in DOM Level 3
-    void initKeyboardEvent (DOMString typeArg, boolean bubblesArg, boolean cancelableArg, Window? viewArg, DOMString keyArg, unsigned long locationArg, DOMString modifiersListArg, boolean repeat, DOMString locale);
+    void initKeyboardEvent (DOMString typeArg, boolean bubblesArg, boolean cancelableArg, Window? viewArg,
+                            DOMString keyArg, unsigned long locationArg, DOMString modifiersListArg,
+                            boolean repeat, DOMString locale);
 };
 
 // https://dvcs.w3.org/hg/dom3events/raw-file/tip/html/DOM3-Events.html#KeyboardEvent-supplemental-interface
diff --git a/servo/components/script/dom/webidls/MouseEvent.webidl b/servo/components/script/dom/webidls/MouseEvent.webidl
index a673cd60523c..be3abc86cddd 100644
--- a/servo/components/script/dom/webidls/MouseEvent.webidl
+++ b/servo/components/script/dom/webidls/MouseEvent.webidl
@@ -38,5 +38,11 @@ dictionary MouseEventInit : SharedKeyboardAndMouseEventInit {
 // https://dvcs.w3.org/hg/dom3events/raw-file/tip/html/DOM3-Events.html#idl-def-MouseEvent-1
 partial interface MouseEvent {
     // Deprecated in DOM Level 3
-    void initMouseEvent (DOMString typeArg, boolean bubblesArg, boolean cancelableArg, Window? viewArg, long detailArg, long screenXArg, long screenYArg, long clientXArg, long clientYArg, boolean ctrlKeyArg, boolean altKeyArg, boolean shiftKeyArg, boolean metaKeyArg, short buttonArg, EventTarget? relatedTargetArg);
+    void initMouseEvent (DOMString typeArg, boolean bubblesArg, boolean cancelableArg,
+                         Window? viewArg, long detailArg,
+                         long screenXArg, long screenYArg,
+                         long clientXArg, long clientYArg,
+                         boolean ctrlKeyArg, boolean altKeyArg,
+                         boolean shiftKeyArg, boolean metaKeyArg,
+                         short buttonArg, EventTarget? relatedTargetArg);
 };
diff --git a/servo/components/script/dom/webidls/Node.webidl b/servo/components/script/dom/webidls/Node.webidl
index 70561bb1b72e..3aa3d17e4d19 100644
--- a/servo/components/script/dom/webidls/Node.webidl
+++ b/servo/components/script/dom/webidls/Node.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * The origin of this IDL file is:
  * https://dom.spec.whatwg.org/#interface-node
  */
diff --git a/servo/components/script/dom/webidls/NodeFilter.webidl b/servo/components/script/dom/webidls/NodeFilter.webidl
index c944e13111e6..213380c89c04 100644
--- a/servo/components/script/dom/webidls/NodeFilter.webidl
+++ b/servo/components/script/dom/webidls/NodeFilter.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * The origin of this IDL file is
  * https://dom.spec.whatwg.org/#interface-nodefilter
  */
diff --git a/servo/components/script/dom/webidls/NodeIterator.webidl b/servo/components/script/dom/webidls/NodeIterator.webidl
index 598efdbe4561..30b0793ecef3 100644
--- a/servo/components/script/dom/webidls/NodeIterator.webidl
+++ b/servo/components/script/dom/webidls/NodeIterator.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * https://dom.spec.whatwg.org/#nodeiterator
  */
 // Import from http://hg.mozilla.org/mozilla-central/raw-file/a5a720259d79/dom/webidl/NodeIterator.webidl
diff --git a/servo/components/script/dom/webidls/NodeList.webidl b/servo/components/script/dom/webidls/NodeList.webidl
index 29d91c69f731..3436de25f718 100644
--- a/servo/components/script/dom/webidls/NodeList.webidl
+++ b/servo/components/script/dom/webidls/NodeList.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * The origin of this IDL file is:
  * https://dom.spec.whatwg.org/#interface-nodelist
  */
diff --git a/servo/components/script/dom/webidls/ParentNode.webidl b/servo/components/script/dom/webidls/ParentNode.webidl
index c7dc425a1fd3..6618f046bb4e 100644
--- a/servo/components/script/dom/webidls/ParentNode.webidl
+++ b/servo/components/script/dom/webidls/ParentNode.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * The origin of this IDL file is
  * https://dom.spec.whatwg.org/#interface-parentnode
  */
diff --git a/servo/components/script/dom/webidls/Performance.webidl b/servo/components/script/dom/webidls/Performance.webidl
index ff7e0ee37547..4ec04b46f760 100644
--- a/servo/components/script/dom/webidls/Performance.webidl
+++ b/servo/components/script/dom/webidls/Performance.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * The origin of this IDL file is
  * https://dvcs.w3.org/hg/webperf/raw-file/tip/specs/NavigationTiming/Overview.html#sec-window.performance-attribute
  */
diff --git a/servo/components/script/dom/webidls/PerformanceTiming.webidl b/servo/components/script/dom/webidls/PerformanceTiming.webidl
index c5dfd4502c78..b066b4be2dcf 100644
--- a/servo/components/script/dom/webidls/PerformanceTiming.webidl
+++ b/servo/components/script/dom/webidls/PerformanceTiming.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * The origin of this IDL file is
  * https://dvcs.w3.org/hg/webperf/raw-file/tip/specs/NavigationTiming/Overview.html#sec-navigation-timing-interface
  */
diff --git a/servo/components/script/dom/webidls/ProcessingInstruction.webidl b/servo/components/script/dom/webidls/ProcessingInstruction.webidl
index a8610bcf8f15..1b25f5f84f6f 100644
--- a/servo/components/script/dom/webidls/ProcessingInstruction.webidl
+++ b/servo/components/script/dom/webidls/ProcessingInstruction.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * The origin of this IDL file is
  * https://dom.spec.whatwg.org/#interface-processinginstruction
  */
diff --git a/servo/components/script/dom/webidls/ProgressEvent.webidl b/servo/components/script/dom/webidls/ProgressEvent.webidl
index 66c1404bd425..a0e86c26ae6d 100644
--- a/servo/components/script/dom/webidls/ProgressEvent.webidl
+++ b/servo/components/script/dom/webidls/ProgressEvent.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * The origin of this IDL file is
  * https://xhr.spec.whatwg.org/#interface-progressevent
  *
diff --git a/servo/components/script/dom/webidls/Range.webidl b/servo/components/script/dom/webidls/Range.webidl
index 0e397816ce7a..9af1786862b8 100644
--- a/servo/components/script/dom/webidls/Range.webidl
+++ b/servo/components/script/dom/webidls/Range.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * The origin of this IDL file is
  * https://dom.spec.whatwg.org/#range
  * https://domparsing.spec.whatwg.org/#dom-range-createcontextualfragment
@@ -71,7 +71,7 @@ interface Range {
 partial interface Range {
   // [NewObject, Throws]
   // DocumentFragment createContextualFragment(DOMString fragment);
-};// 
+};//
 
 // http://dev.w3.org/csswg/cssom-view/#extensions-to-the-range-interface
 partial interface Range {
diff --git a/servo/components/script/dom/webidls/Storage.webidl b/servo/components/script/dom/webidls/Storage.webidl
index eb3007c28157..3f97f96ad8c4 100644
--- a/servo/components/script/dom/webidls/Storage.webidl
+++ b/servo/components/script/dom/webidls/Storage.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * The origin of this IDL file is
  * https://html.spec.whatwg.org/multipage/#webstorage
  *
diff --git a/servo/components/script/dom/webidls/StorageEvent.webidl b/servo/components/script/dom/webidls/StorageEvent.webidl
index 55087a4b7313..884d8d2f88bb 100644
--- a/servo/components/script/dom/webidls/StorageEvent.webidl
+++ b/servo/components/script/dom/webidls/StorageEvent.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * Interface for a client side storage. See
  * https://html.spec.whatwg.org/multipage/#the-storageevent-interface
  * for more information.
diff --git a/servo/components/script/dom/webidls/TestBindingProxy.webidl b/servo/components/script/dom/webidls/TestBindingProxy.webidl
index 4d01200f4050..3a478eb8acf8 100644
--- a/servo/components/script/dom/webidls/TestBindingProxy.webidl
+++ b/servo/components/script/dom/webidls/TestBindingProxy.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * This IDL file was created to test the special operations (see
  * https://heycam.github.io/webidl/#idl-special-operations) without converting
  * TestBinding.webidl into a proxy.
diff --git a/servo/components/script/dom/webidls/Text.webidl b/servo/components/script/dom/webidls/Text.webidl
index 74f84d1e89f6..4d84783e3b27 100644
--- a/servo/components/script/dom/webidls/Text.webidl
+++ b/servo/components/script/dom/webidls/Text.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * The origin of this IDL file is
  * https://dom.spec.whatwg.org/
  *
diff --git a/servo/components/script/dom/webidls/TreeWalker.webidl b/servo/components/script/dom/webidls/TreeWalker.webidl
index a1084f3dee18..c05f86dcdc8f 100644
--- a/servo/components/script/dom/webidls/TreeWalker.webidl
+++ b/servo/components/script/dom/webidls/TreeWalker.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * The origin of this IDL file is
  * https://dom.spec.whatwg.org/#interface-treewalker
  */
diff --git a/servo/components/script/dom/webidls/URL.webidl b/servo/components/script/dom/webidls/URL.webidl
index b0d92b565be5..2e03ea9b8582 100644
--- a/servo/components/script/dom/webidls/URL.webidl
+++ b/servo/components/script/dom/webidls/URL.webidl
@@ -1,6 +1,6 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // https://url.spec.whatwg.org/#url
 [Constructor(USVString url, optional USVString base)/*,
diff --git a/servo/components/script/dom/webidls/URLSearchParams.webidl b/servo/components/script/dom/webidls/URLSearchParams.webidl
index f0ddafad2910..1afdc30a3529 100644
--- a/servo/components/script/dom/webidls/URLSearchParams.webidl
+++ b/servo/components/script/dom/webidls/URLSearchParams.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * The origin of this IDL file is
  * https://url.spec.whatwg.org/#interface-urlsearchparams
  */
diff --git a/servo/components/script/dom/webidls/WebGLActiveInfo.webidl b/servo/components/script/dom/webidls/WebGLActiveInfo.webidl
index 8b4d63ea0b7c..7195e8bacaa6 100644
--- a/servo/components/script/dom/webidls/WebGLActiveInfo.webidl
+++ b/servo/components/script/dom/webidls/WebGLActiveInfo.webidl
@@ -1,3 +1,6 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 //
 // WebGL IDL definitions scraped from the Khronos specification:
 // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.7
diff --git a/servo/components/script/dom/webidls/WebGLBuffer.webidl b/servo/components/script/dom/webidls/WebGLBuffer.webidl
index 418e9ef231e2..344850d42e6b 100644
--- a/servo/components/script/dom/webidls/WebGLBuffer.webidl
+++ b/servo/components/script/dom/webidls/WebGLBuffer.webidl
@@ -1,3 +1,6 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 //
 // WebGL IDL definitions scraped from the Khronos specification:
 // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.4
diff --git a/servo/components/script/dom/webidls/WebGLFramebuffer.webidl b/servo/components/script/dom/webidls/WebGLFramebuffer.webidl
index 764543704106..2f21edafc0a6 100644
--- a/servo/components/script/dom/webidls/WebGLFramebuffer.webidl
+++ b/servo/components/script/dom/webidls/WebGLFramebuffer.webidl
@@ -1,3 +1,6 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 //
 // WebGL IDL definitions scraped from the Khronos specification:
 // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.7
diff --git a/servo/components/script/dom/webidls/WebGLObject.webidl b/servo/components/script/dom/webidls/WebGLObject.webidl
index 468f3762b44b..040c76be0c74 100644
--- a/servo/components/script/dom/webidls/WebGLObject.webidl
+++ b/servo/components/script/dom/webidls/WebGLObject.webidl
@@ -1,3 +1,6 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 //
 // WebGL IDL definitions scraped from the Khronos specification:
 // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.3
diff --git a/servo/components/script/dom/webidls/WebGLProgram.webidl b/servo/components/script/dom/webidls/WebGLProgram.webidl
index 80b2d535931b..0c9ede907e00 100644
--- a/servo/components/script/dom/webidls/WebGLProgram.webidl
+++ b/servo/components/script/dom/webidls/WebGLProgram.webidl
@@ -1,3 +1,6 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 //
 // WebGL IDL definitions scraped from the Khronos specification:
 // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.6
diff --git a/servo/components/script/dom/webidls/WebGLRenderbuffer.webidl b/servo/components/script/dom/webidls/WebGLRenderbuffer.webidl
index 120c72729659..451621ec30ce 100644
--- a/servo/components/script/dom/webidls/WebGLRenderbuffer.webidl
+++ b/servo/components/script/dom/webidls/WebGLRenderbuffer.webidl
@@ -1,3 +1,6 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 //
 // WebGL IDL definitions scraped from the Khronos specification:
 // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.5
diff --git a/servo/components/script/dom/webidls/WebGLRenderingContext.webidl b/servo/components/script/dom/webidls/WebGLRenderingContext.webidl
index 8f4b6f95f025..a888f97bac70 100644
--- a/servo/components/script/dom/webidls/WebGLRenderingContext.webidl
+++ b/servo/components/script/dom/webidls/WebGLRenderingContext.webidl
@@ -1,3 +1,6 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 //
 // WebGL IDL definitions scraped from the Khronos specification:
 // https://www.khronos.org/registry/webgl/specs/latest/
diff --git a/servo/components/script/dom/webidls/WebGLShader.webidl b/servo/components/script/dom/webidls/WebGLShader.webidl
index c308e303da9e..f160602cba71 100644
--- a/servo/components/script/dom/webidls/WebGLShader.webidl
+++ b/servo/components/script/dom/webidls/WebGLShader.webidl
@@ -1,3 +1,6 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 //
 // WebGL IDL definitions scraped from the Khronos specification:
 // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.8
diff --git a/servo/components/script/dom/webidls/WebGLShaderPrecisionFormat.webidl b/servo/components/script/dom/webidls/WebGLShaderPrecisionFormat.webidl
index acbbeeceea18..2d299232e901 100644
--- a/servo/components/script/dom/webidls/WebGLShaderPrecisionFormat.webidl
+++ b/servo/components/script/dom/webidls/WebGLShaderPrecisionFormat.webidl
@@ -1,3 +1,6 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 //
 // WebGL IDL definitions scraped from the Khronos specification:
 // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.7
diff --git a/servo/components/script/dom/webidls/WebGLTexture.webidl b/servo/components/script/dom/webidls/WebGLTexture.webidl
index ef9a4967db80..f1b7fa20f1ec 100644
--- a/servo/components/script/dom/webidls/WebGLTexture.webidl
+++ b/servo/components/script/dom/webidls/WebGLTexture.webidl
@@ -1,3 +1,6 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 //
 // WebGL IDL definitions scraped from the Khronos specification:
 // https://www.khronos.org/registry/webgl/specs/latest/#5.9
diff --git a/servo/components/script/dom/webidls/WebGLUniformLocation.webidl b/servo/components/script/dom/webidls/WebGLUniformLocation.webidl
index 2331c90c9614..467c2d005721 100644
--- a/servo/components/script/dom/webidls/WebGLUniformLocation.webidl
+++ b/servo/components/script/dom/webidls/WebGLUniformLocation.webidl
@@ -1,3 +1,6 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 //
 // WebGL IDL definitions scraped from the Khronos specification:
 // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.10
diff --git a/servo/components/script/dom/webidls/Window.webidl b/servo/components/script/dom/webidls/Window.webidl
index 24a337988ad7..54c112cec41d 100644
--- a/servo/components/script/dom/webidls/Window.webidl
+++ b/servo/components/script/dom/webidls/Window.webidl
@@ -38,7 +38,8 @@
   //readonly attribute WindowProxy parent;
   readonly attribute Window parent;
   readonly attribute Element? frameElement;
-  //WindowProxy open(optional DOMString url = "about:blank", optional DOMString target = "_blank", optional DOMString features = "", optional boolean replace = false);
+  //WindowProxy open(optional DOMString url = "about:blank", optional DOMString target = "_blank",
+  //                 optional DOMString features = "", optional boolean replace = false);
   //getter WindowProxy (unsigned long index);
   //getter object (DOMString name);
 
diff --git a/servo/components/script/dom/webidls/XMLHttpRequest.webidl b/servo/components/script/dom/webidls/XMLHttpRequest.webidl
index 97e6232cbfcd..3285e8596917 100644
--- a/servo/components/script/dom/webidls/XMLHttpRequest.webidl
+++ b/servo/components/script/dom/webidls/XMLHttpRequest.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * The origin of this IDL file is
  * https://xhr.spec.whatwg.org/#interface-xmlhttprequest
  *
@@ -44,7 +44,9 @@ interface XMLHttpRequest : XMLHttpRequestEventTarget {
   [Throws]
   void open(ByteString method, /* [EnsureUTF16] */ DOMString url);
   [Throws]
-  void open(ByteString method, /* [EnsureUTF16] */ DOMString url, boolean async, optional /* [EnsureUTF16] */ DOMString? username = null, optional /* [EnsureUTF16] */ DOMString? password = null);
+  void open(ByteString method, /* [EnsureUTF16] */ DOMString url, boolean async,
+            optional /* [EnsureUTF16] */ DOMString? username = null,
+            optional /* [EnsureUTF16] */ DOMString? password = null);
 
   [Throws]
   void setRequestHeader(ByteString name, ByteString value);
diff --git a/servo/components/script/dom/webidls/XMLHttpRequestEventTarget.webidl b/servo/components/script/dom/webidls/XMLHttpRequestEventTarget.webidl
index a519dc77c1d7..fa2d9625ad9d 100644
--- a/servo/components/script/dom/webidls/XMLHttpRequestEventTarget.webidl
+++ b/servo/components/script/dom/webidls/XMLHttpRequestEventTarget.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * The origin of this IDL file is
  * https://xhr.spec.whatwg.org/#interface-xmlhttprequest
  *
diff --git a/servo/components/script/dom/webidls/XMLHttpRequestUpload.webidl b/servo/components/script/dom/webidls/XMLHttpRequestUpload.webidl
index fc939152e39a..8c21dbaea4a4 100644
--- a/servo/components/script/dom/webidls/XMLHttpRequestUpload.webidl
+++ b/servo/components/script/dom/webidls/XMLHttpRequestUpload.webidl
@@ -1,8 +1,8 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/.
- *
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/*
  * The origin of this IDL file is
  * https://xhr.spec.whatwg.org/#interface-xmlhttprequest
  *
diff --git a/servo/components/webdriver_server/Cargo.toml b/servo/components/webdriver_server/Cargo.toml
index 59e25f9dd088..7fb28951fb8b 100644
--- a/servo/components/webdriver_server/Cargo.toml
+++ b/servo/components/webdriver_server/Cargo.toml
@@ -27,4 +27,4 @@ git = "https://github.com/pcwalton/ipc-channel"
 log = "0.3"
 rustc-serialize = "0.3.4"
 url = "0.2.36"
-uuid = "0.1"
\ No newline at end of file
+uuid = "0.1"
diff --git a/servo/python/servo/bootstrap_commands.py b/servo/python/servo/bootstrap_commands.py
index 0e12b7863421..37ae5d5b8268 100644
--- a/servo/python/servo/bootstrap_commands.py
+++ b/servo/python/servo/bootstrap_commands.py
@@ -217,7 +217,7 @@ class MachCommands(CommandBase):
 
         try:
             content_base64 = download_bytes("Chromium HSTS preload list", chromium_hsts_url)
-        except urllib2.URLError, e:
+        except urllib2.URLError:
             print("Unable to download chromium HSTS preload list; are you connected to the internet?")
             sys.exit(1)
 
diff --git a/servo/python/tidy.py b/servo/python/tidy.py
index 617caf04631e..a474abaa0c8d 100644
--- a/servo/python/tidy.py
+++ b/servo/python/tidy.py
@@ -7,12 +7,13 @@
 # option. This file may not be copied, modified, or distributed
 # except according to those terms.
 
+import contextlib
 import os
 import fnmatch
 import itertools
 import re
+import StringIO
 import sys
-import toml
 from licenseck import licenses
 
 filetypes_to_check = [".rs", ".rc", ".cpp", ".c", ".h", ".py", ".toml", ".webidl"]
@@ -78,7 +79,9 @@ EMACS_HEADER = "/* -*- Mode:"
 VIM_HEADER = "/* vim:"
 
 
-def check_license(contents):
+def check_license(file_name, contents):
+    if file_name.endswith(".toml"):
+        raise StopIteration
     while contents.startswith(EMACS_HEADER) or contents.startswith(VIM_HEADER):
         _, _, contents = contents.partition("\n")
     valid_license = any(contents.startswith(license) for license in licenses)
@@ -115,7 +118,7 @@ def check_whitespace(idx, line):
         yield (idx + 1, "CR on line")
 
 
-def check_by_line(contents):
+def check_by_line(file_name, contents):
     lines = contents.splitlines(True)
     for idx, line in enumerate(lines):
         errors = itertools.chain(
@@ -127,33 +130,43 @@ def check_by_line(contents):
             yield error
 
 
-def check_flake8(file_paths):
-    from flake8.main import check_file
+def check_flake8(file_name, contents):
+    from flake8.main import check_code
+
+    if not file_name.endswith(".py"):
+        raise StopIteration
+
+    @contextlib.contextmanager
+    def stdout_redirect(where):
+        sys.stdout = where
+        try:
+            yield where
+        finally:
+            sys.stdout = sys.__stdout__
 
     ignore = {
         "W291",  # trailing whitespace; the standard tidy process will enforce no trailing whitespace
         "E501",  # 80 character line length; the standard tidy process will enforce line length
     }
 
-    num_errors = 0
-
-    for file_path in file_paths:
-        if os.path.splitext(file_path)[-1].lower() != ".py":
-            continue
-
-        num_errors += check_file(file_path, ignore=ignore)
-
-    return num_errors
+    output = StringIO.StringIO()
+    with stdout_redirect(output):
+        check_code(contents, ignore=ignore)
+    for error in output.getvalue().splitlines():
+        _, line_num, _, message = error.split(":")
+        yield line_num, message.strip()
 
 
-def check_toml(contents):
+def check_toml(file_name, contents):
+    if not file_name.endswith(".toml"):
+        raise StopIteration
     contents = contents.splitlines(True)
     for idx, line in enumerate(contents):
         if line.find("*") != -1:
             yield (idx + 1, "found asterisk instead of minimum version number")
 
 
-def check_webidl_spec(contents):
+def check_webidl_spec(file_name, contents):
     # Sorted by this function (in pseudo-Rust). The idea is to group the same
     # organization together.
     # fn sort_standards(a: &Url, b: &Url) -> Ordering {
@@ -172,6 +185,8 @@ def check_webidl_spec(contents):
     #     }
     #     a_domain.path().cmp(b_domain.path())
     # }
+    if not file_name.endswith(".webidl"):
+        raise StopIteration
     standards = [
         "//www.khronos.org/registry/webgl/specs",
         "//developer.mozilla.org/en-US/docs/Web/API",
@@ -193,25 +208,18 @@ def check_webidl_spec(contents):
     ]
     for i in standards:
         if contents.find(i) != -1:
-            return True
-    return False
+            raise StopIteration
+    yield 0, "No specification link found."
 
 
 def collect_errors_for_files(files_to_check, checking_functions):
     for file_name in files_to_check:
         with open(file_name, "r") as fp:
             contents = fp.read()
-            if file_name.endswith(".toml"):
-                for error in check_toml(contents):
+            for check in checking_functions:
+                for error in check(file_name, contents):
+                    # filename, line, message
                     yield (file_name, error[0], error[1])
-            elif file_name.endswith(".webidl"):
-                if not check_webidl_spec(contents):
-                    yield (file_name, 0, "No specification link found.")
-            else:
-                for check in checking_functions:
-                    for error in check(contents):
-                        # filename, line, message
-                        yield (file_name, error[0], error[1])
 
 
 def check_reftest_order(files_to_check):
@@ -242,9 +250,7 @@ def scan():
     all_files = collect_file_names()
     files_to_check = filter(should_check, all_files)
 
-    num_flake8_errors = check_flake8(files_to_check)
-
-    checking_functions = [check_license, check_by_line]
+    checking_functions = [check_license, check_by_line, check_flake8, check_toml, check_webidl_spec]
     errors = collect_errors_for_files(files_to_check, checking_functions)
 
     reftest_files = collect_file_names(reftest_directories)
@@ -253,7 +259,7 @@ def scan():
 
     errors = list(itertools.chain(errors, r_errors))
 
-    if errors or num_flake8_errors:
+    if errors:
         for error in errors:
             print("{}:{}: {}".format(*error))
         return 1