Format loop statements

src/expr.rs

@@ -12,8 +12,8 @@ use visitor::FmtVisitor;
 use utils::*;
 use lists::{write_list, ListFormatting, SeparatorTactic, ListTactic};
 
-use syntax::{ast, ptr};
-use syntax::codemap::{Pos, Span};
+use syntax::{ast, ptr, visit};
+use syntax::codemap::{Pos, Span, BytePos};
 use syntax::parse::token;
 use syntax::print::pprust;
 
@@ -250,9 +250,33 @@ impl<'a> FmtVisitor<'a> {
             ast::Expr_::ExprTup(ref items) => {
                 return self.rewrite_tuple_lit(items, width, offset);
             }
+            ast::Expr_::ExprLoop(ref block, _) => {
+                self.rewrite_loop(block);
+                return "".to_string();
+            }
             _ => {}
         }
 
         self.snippet(expr.span)
     }
+
+    fn rewrite_loop(&mut self, block: &ast::Block) {
+        self.changes.push_str_span(block.span, "loop {");
+
+        self.last_pos = block.span.lo + BytePos(1);
+        self.block_indent += config!(tab_spaces);
+
+        visit::walk_block(self, block);
+
+        self.block_indent -= config!(tab_spaces);
+
+        if let Some(stmt) = block.stmts.last() {
+            self.changes.push_str_span(stmt.span, ";");
+            self.last_pos = stmt.span.hi;
+        }
+
+        self.format_missing_with_indent(block.span.hi - BytePos(1));
+
+        self.changes.push_str_span(block.span, "}");
+    }
 }

tests/source/loop.rs

@@ -0,0 +1,15 @@
+
+fn looper() {
+loop       {}
+         loop{}
+    loop {
+}
+loop
+{let x=1;let y=2;}
+
+loop /*comment1*/ {// comment2
+ /*comment3*/    let x=1;//comment4
+    let y=2;//comment5
+/*comment6*/}//comment7
+
+}

tests/system.rs

@@ -152,7 +152,7 @@ fn handle_result(result: HashMap<String, String>) {
     for (file_name, fmt_text) in result {
         // If file is in tests/source, compare to file with same name in tests/target
         let target_file_name = get_target(&file_name);
-        let mut f = fs::File::open(&target_file_name).ok().expect("Couldn't open target.");
+        let mut f = fs::File::open(&target_file_name).ok().expect(&format!("Couldn't open target: {}", target_file_name));
 
         let mut text = String::new();
         // TODO: speedup by running through bytes iterator

tests/target/loop.rs

@@ -0,0 +1,19 @@
+
+fn looper() {
+    loop {
+    }
+    loop {
+    }
+    loop {
+    }
+    loop {
+        let x=1;
+        let y=2;
+    }
+
+    loop {// comment2
+ /*comment3*/        let x=1;//comment4
+        let y=2;//comment5
+/*comment6*/    }//comment7
+
+}