From 875981ece592b03bcf06f16b6613ddabfa11133f Mon Sep 17 00:00:00 2001 From: UK992 Date: Thu, 8 Sep 2016 16:08:38 +0200 Subject: Fix ordering `use` statements with braces --- python/tidy/servo_tidy/tidy.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'python/tidy/servo_tidy/tidy.py') diff --git a/python/tidy/servo_tidy/tidy.py b/python/tidy/servo_tidy/tidy.py index 340a3cd1a83..081352f8a43 100644 --- a/python/tidy/servo_tidy/tidy.py +++ b/python/tidy/servo_tidy/tidy.py @@ -516,10 +516,13 @@ def check_rust(file_name, lines): yield (idx + 1, "use statement spans multiple lines") # strip "use" from the begin and ";" from the end current_use = line[4:-1] - if indent == current_indent and prev_use and current_use < prev_use: - yield(idx + 1, decl_message.format("use statement") - + decl_expected.format(prev_use) - + decl_found.format(current_use)) + if prev_use: + current_use_cut = current_use.replace("{self,", ".").replace("{", ".") + prev_use_cut = prev_use.replace("{self,", ".").replace("{", ".") + if indent == current_indent and current_use_cut < prev_use_cut: + yield(idx + 1, decl_message.format("use statement") + + decl_expected.format(prev_use) + + decl_found.format(current_use)) prev_use = current_use current_indent = indent -- cgit v1.2.3