auto merge of #4832 : sanxiyn/rust/pretty-exact, r=graydon

src/test/pretty/alt-naked-expr-long.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-exact
+// pp-exact
 
 // actually this doesn't quite look how I want it to, but I can't
 // get the prettyprinter to indent the long expr
@@ -18,8 +18,8 @@ fn main() {
     let y =
         match x {
           Some(_) =>
-          ~"some" + ~"very" + ~"very" + ~"very" + ~"very" + ~"very" +
-              ~"very" + ~"very" + ~"very" + ~"long" + ~"string",
+          ~"some" + ~"very" + ~"very" + ~"very" + ~"very" + ~"very" + ~"very"
+              + ~"very" + ~"very" + ~"long" + ~"string",
           None => ~"none"
         };
     assert y == ~"some(_)";

src/test/pretty/alt-naked-expr-medium.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-exact
+// pp-exact
 
 fn main() {
     let x = Some(3);

src/test/pretty/alt-naked-expr.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-exact
+// pp-exact
 
 fn main() {
     let x = Some(3);

src/test/pretty/do1.rs

@@ -8,10 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// pretty-exact
+// pp-exact
 
-fn f(f: fn@(int)) { f(10) }
+fn f(f: @fn(int)) { f(10) }
 
-fn main() {
-    do f |i| { assert i == 10 }
-}
+fn main() { do f |i| { assert i == 10 } }