Auto merge of #10751 - zwn:tidy-start-operator, r=Wafflespeanut

Report lines starting with && in tidy

Partial implementation of the issue #10692 (the easy part).

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10751)
<!-- Reviewable:end -->

14 files changed, 37 insertions, 31 deletions

diff --git a/components/gfx/text/glyph.rs b/components/gfx/text/glyph.rs
index 9c41bd23f2c..b1d6222f29d 100644
--- a/components/gfx/text/glyph.rs
+++ b/components/gfx/text/glyph.rs
@@ -469,9 +469,9 @@ impl<'a> GlyphStore {
                                     character: char,
                                     data: &GlyphData) {
         let glyph_is_compressible = is_simple_glyph_id(data.id) &&
-            is_simple_advance(data.advance)
-                && data.offset == Point2D::zero()
-                && data.cluster_start;  // others are stored in detail buffer
+            is_simple_advance(data.advance) &&
+                data.offset == Point2D::zero() &&
+                data.cluster_start;  // others are stored in detail buffer
 
         debug_assert!(data.ligature_start); // can't compress ligature continuation glyphs.
         debug_assert!(i < self.char_len());
diff --git a/components/gfx/text/shaping/harfbuzz.rs b/components/gfx/text/shaping/harfbuzz.rs
index 495b6af6525..5af3dfcb08c 100644
--- a/components/gfx/text/shaping/harfbuzz.rs
+++ b/components/gfx/text/shaping/harfbuzz.rs
@@ -412,8 +412,8 @@ impl Shaper {
 
             let mut covered_byte_span = char_byte_span.clone();
             // extend, clipping at end of text range.
-            while covered_byte_span.end() < byte_max
-                    && byte_to_glyph[covered_byte_span.end()] == NO_GLYPH {
+            while covered_byte_span.end() < byte_max &&
+                    byte_to_glyph[covered_byte_span.end()] == NO_GLYPH {
                 let range = text.char_range_at(covered_byte_span.end());
                 drop(range.ch);
                 covered_byte_span.extend_to(range.next);
diff --git a/components/layout/traversal.rs b/components/layout/traversal.rs
index 00732f852ee..1fe5388549e 100644
--- a/components/layout/traversal.rs
+++ b/components/layout/traversal.rs
@@ -194,9 +194,9 @@ impl<'a> PostorderFlowTraversal for AssignBSizes<'a> {
     #[inline]
     fn should_process(&self, flow: &mut Flow) -> bool {
         let base = flow::base(flow);
-        base.restyle_damage.intersects(REFLOW_OUT_OF_FLOW | REFLOW)
+        base.restyle_damage.intersects(REFLOW_OUT_OF_FLOW | REFLOW) &&
         // The fragmentation countainer is responsible for calling Flow::fragment recursively
-        && !base.flags.contains(CAN_BE_FRAGMENTED)
+        !base.flags.contains(CAN_BE_FRAGMENTED)
     }
 }
 
diff --git a/components/net/cookie.rs b/components/net/cookie.rs
index f5c021e2b91..1dc36e60703 100644
--- a/components/net/cookie.rs
+++ b/components/net/cookie.rs
@@ -136,10 +136,10 @@ impl Cookie {
         if string == domain_string {
             return true;
         }
-        if string.ends_with(domain_string)
-            && string.as_bytes()[string.len()-domain_string.len()-1] == b'.'
-            && string.parse::<Ipv4Addr>().is_err()
-            && string.parse::<Ipv6Addr>().is_err() {
+        if string.ends_with(domain_string) &&
+            string.as_bytes()[string.len()-domain_string.len()-1] == b'.' &&
+            string.parse::<Ipv4Addr>().is_err() &&
+            string.parse::<Ipv6Addr>().is_err() {
             return true;
         }
         false
diff --git a/components/plugins/lints/transmute_type.rs b/components/plugins/lints/transmute_type.rs
index 8f9f4d7ce6b..ef2806f5f2f 100644
--- a/components/plugins/lints/transmute_type.rs
+++ b/components/plugins/lints/transmute_type.rs
@@ -28,8 +28,8 @@ impl LateLintPass for TransmutePass {
                 match expr.node {
                     hir::ExprPath(_, ref path) => {
                         if path.segments.last()
-                                        .map_or(false, |ref segment| segment.identifier.name.as_str() == "transmute")
-                           && args.len() == 1 {
+                                        .map_or(false, |ref segment| segment.identifier.name.as_str() == "transmute") &&
+                           args.len() == 1 {
                             let tcx = cx.tcx;
                             cx.span_lint(TRANSMUTE_TYPE_LINT, ex.span,
                                          &format!("Transmute to {:?} from {:?} detected",
diff --git a/components/script/dom/htmlcollection.rs b/components/script/dom/htmlcollection.rs
index a7bf82ae50e..b1f1771dd07 100644
--- a/components/script/dom/htmlcollection.rs
+++ b/components/script/dom/htmlcollection.rs
@@ -161,8 +161,8 @@ impl HTMLCollection {
         }
         impl CollectionFilter for TagNameNSFilter {
             fn filter(&self, elem: &Element, _root: &Node) -> bool {
-                    ((self.qname.ns == Namespace(atom!("*"))) || (self.qname.ns == *elem.namespace()))
-                &&  ((self.qname.local == atom!("*")) || (self.qname.local == *elem.local_name()))
+                    ((self.qname.ns == Namespace(atom!("*"))) || (self.qname.ns == *elem.namespace())) &&
+                    ((self.qname.local == atom!("*")) || (self.qname.local == *elem.local_name()))
             }
         }
         let filter = TagNameNSFilter {
diff --git a/components/script/dom/htmlformelement.rs b/components/script/dom/htmlformelement.rs
index 3e7421de443..a844cc3c1cb 100644
--- a/components/script/dom/htmlformelement.rs
+++ b/components/script/dom/htmlformelement.rs
@@ -244,8 +244,8 @@ impl HTMLFormElement {
         let base = doc.url();
         // TODO: Handle browsing contexts
         // Step 4
-        if submit_method_flag == SubmittedFrom::NotFromFormSubmitMethod
-           && !submitter.no_validate(self)
+        if submit_method_flag == SubmittedFrom::NotFromFormSubmitMethod &&
+           !submitter.no_validate(self)
         {
             if self.interactive_validation().is_err() {
                 // TODO: Implement event handlers on all form control elements
diff --git a/components/script/dom/htmltableelement.rs b/components/script/dom/htmltableelement.rs
index 4b5cd44773d..5ad77e9e8b4 100644
--- a/components/script/dom/htmltableelement.rs
+++ b/components/script/dom/htmltableelement.rs
@@ -132,8 +132,8 @@ impl HTMLTableElementMethods for HTMLTableElement {
 
         impl CollectionFilter for TableRowFilter {
             fn filter(&self, elem: &Element, root: &Node) -> bool {
-                elem.is::<HTMLTableRowElement>()
-                    && (root.is_parent_of(elem.upcast())
+                elem.is::<HTMLTableRowElement>() &&
+                    (root.is_parent_of(elem.upcast())
                         || self.sections.iter().any(|ref section| section.is_parent_of(elem.upcast())))
             }
         }
@@ -250,9 +250,9 @@ impl HTMLTableElementMethods for HTMLTableElement {
         struct TBodiesFilter;
         impl CollectionFilter for TBodiesFilter {
             fn filter(&self, elem: &Element, root: &Node) -> bool {
-                elem.is::<HTMLTableSectionElement>()
-                    && elem.local_name() == &atom!("tbody")
-                    && elem.upcast::<Node>().GetParentNode().r() == Some(root)
+                elem.is::<HTMLTableSectionElement>() &&
+                    elem.local_name() == &atom!("tbody") &&
+                    elem.upcast::<Node>().GetParentNode().r() == Some(root)
             }
         }
 
diff --git a/components/script/dom/htmltablerowelement.rs b/components/script/dom/htmltablerowelement.rs
index bb83e00b0db..2969102984d 100644
--- a/components/script/dom/htmltablerowelement.rs
+++ b/components/script/dom/htmltablerowelement.rs
@@ -29,8 +29,8 @@ use util::str::DOMString;
 struct CellsFilter;
 impl CollectionFilter for CellsFilter {
     fn filter(&self, elem: &Element, root: &Node) -> bool {
-        (elem.is::<HTMLTableHeaderCellElement>() || elem.is::<HTMLTableDataCellElement>())
-            && elem.upcast::<Node>().GetParentNode().r() == Some(root)
+        (elem.is::<HTMLTableHeaderCellElement>() || elem.is::<HTMLTableDataCellElement>()) &&
+            elem.upcast::<Node>().GetParentNode().r() == Some(root)
     }
 }
 
diff --git a/components/script/dom/htmltablesectionelement.rs b/components/script/dom/htmltablesectionelement.rs
index e51caa9f30e..fc737aed9ea 100644
--- a/components/script/dom/htmltablesectionelement.rs
+++ b/components/script/dom/htmltablesectionelement.rs
@@ -44,8 +44,8 @@ impl HTMLTableSectionElement {
 struct RowsFilter;
 impl CollectionFilter for RowsFilter {
     fn filter(&self, elem: &Element, root: &Node) -> bool {
-        elem.is::<HTMLTableRowElement>()
-            && elem.upcast::<Node>().GetParentNode().r() == Some(root)
+        elem.is::<HTMLTableRowElement>() &&
+            elem.upcast::<Node>().GetParentNode().r() == Some(root)
     }
 }
 
diff --git a/python/tidy/servo_tidy/tidy.py b/python/tidy/servo_tidy/tidy.py
index 0baa11dfe90..aca74956c6f 100644
--- a/python/tidy/servo_tidy/tidy.py
+++ b/python/tidy/servo_tidy/tidy.py
@@ -378,6 +378,7 @@ def check_rust(file_name, lines):
             (r": &Vec<", "use &[T] instead of &Vec<T>", no_filter),
             # No benefit over using &str
             (r": &String", "use &str instead of &String", no_filter),
+            (r"^&&", "operators should go at the end of the first line", no_filter),
         ]
 
         for pattern, message, filter_func in regex_rules:
@@ -647,6 +648,7 @@ def scan(faster=False, progress=True):
     error = None
     for error in errors:
         print "\r\033[94m{}\033[0m:\033[93m{}\033[0m: \033[91m{}\033[0m".format(*error)
+    print
     if error is None:
-        print "\n\033[92mtidy reported no errors.\033[0m"
+        print "\033[92mtidy reported no errors.\033[0m"
     return int(error is not None)
diff --git a/python/tidy/servo_tidy_tests/rust_tidy.rs b/python/tidy/servo_tidy_tests/rust_tidy.rs
index 680b527f679..580f9e2ea96 100644
--- a/python/tidy/servo_tidy_tests/rust_tidy.rs
+++ b/python/tidy/servo_tidy_tests/rust_tidy.rs
@@ -32,6 +32,9 @@ impl test {
     }
 
     fn test_fun2(y : &String, z : &Vec<f32>) -> f32 {
-        1
+        let x = true;
+        x
+            && x;
     }
+
 }
diff --git a/python/tidy/servo_tidy_tests/test_tidy.py b/python/tidy/servo_tidy_tests/test_tidy.py
index 69bb4ae4e46..f61c7961195 100644
--- a/python/tidy/servo_tidy_tests/test_tidy.py
+++ b/python/tidy/servo_tidy_tests/test_tidy.py
@@ -70,6 +70,7 @@ class CheckTidiness(unittest.TestCase):
         self.assertEqual('extra space before :', errors.next()[2])
         self.assertEqual('use &[T] instead of &Vec<T>', errors.next()[2])
         self.assertEqual('use &str instead of &String', errors.next()[2])
+        self.assertEqual('operators should go at the end of the first line', errors.next()[2])
         self.assertNoMoreErrors(errors)
 
     def test_spec_link(self):
diff --git a/support/android/build-apk/src/main.rs b/support/android/build-apk/src/main.rs
index 80f7464bc7d..f9326f76452 100644
--- a/support/android/build-apk/src/main.rs
+++ b/support/android/build-apk/src/main.rs
@@ -274,9 +274,9 @@ fn find_native_libs(args: &Args) -> HashMap<String, PathBuf> {
             (Some(file_name), Some(extension)) => {
                 let file_name = file_name.to_str().unwrap();
 
-                if file_name.starts_with("lib")
-                    && extension == "so"
-                    && args.shared_libraries.contains(file_name) {
+                if file_name.starts_with("lib") &&
+                    extension == "so" &&
+                    args.shared_libraries.contains(file_name) {
                         println!("Adding the file {:?}", file_name);
                         native_shared_libs.insert(file_name.to_string(), path.to_path_buf().clone());
                         break;