Auto merge of #7362 - wilmoz:ForbidMultilineImports, r=jdm

Forbid multiline imports

https://github.com/servo/servo/issues/7356

2 files changed, 5 insertions, 7 deletions

diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs
index 2effacd8c59..d9ed4d0d84c 100644
--- a/components/script/dom/webglrenderingcontext.rs
+++ b/components/script/dom/webglrenderingcontext.rs
@@ -2,13 +2,12 @@
  * 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/. */
 
-use canvas_traits::
-            {CanvasMsg, CanvasWebGLMsg, CanvasCommonMsg, WebGLError,
-             WebGLShaderParameter, WebGLFramebufferBindingRequest};
 use canvas_traits::WebGLError::*;
-use dom::bindings::codegen::Bindings::WebGLRenderingContextBinding::
-            {self, WebGLContextAttributes, WebGLRenderingContextMethods};
+use canvas_traits::{CanvasMsg, CanvasWebGLMsg, CanvasCommonMsg, WebGLError};
+use canvas_traits::{WebGLShaderParameter, WebGLFramebufferBindingRequest};
 use dom::bindings::codegen::Bindings::WebGLRenderingContextBinding::WebGLRenderingContextConstants as constants;
+use dom::bindings::codegen::Bindings::WebGLRenderingContextBinding::{WebGLRenderingContextMethods};
+use dom::bindings::codegen::Bindings::WebGLRenderingContextBinding::{self, WebGLContextAttributes};
 use dom::bindings::codegen::InheritTypes::NodeCast;
 use dom::bindings::codegen::UnionTypes::ImageDataOrHTMLImageElementOrHTMLCanvasElementOrHTMLVideoElement;
 
diff --git a/python/tidy.py b/python/tidy.py
index 88e86d68502..43ff23aeff5 100644
--- a/python/tidy.py
+++ b/python/tidy.py
@@ -246,8 +246,7 @@ def check_rust(file_name, contents):
         # imports must be in the same line and alphabetically sorted
         if line.startswith("use "):
             use = line[4:]
-            match = use.find('{')
-            if match >= 0 and "}" not in use[match:]:
+            if not use.endswith(";"):
                 yield (idx + 1, "use statement spans multiple lines")
             uses.append(use[:len(use) - 1])
         elif len(uses) > 0: