Support single-line functions

[rust.git] / tests / target / multiple.rs

diff --git a/tests/target/multiple.rs b/tests/target/multiple.rs
index 2ec281ae04ee9d50b68acf43052eefb0d291c51e..f39a7bcd53da1515e556d657791f4bcb2541958e 100644 (file)
--- a/tests/target/multiple.rs
+++ b/tests/target/multiple.rs
@@ -1,3 +1,4 @@
+// rustfmt-wrap_comments: true
 // Test of lots of random stuff.
 // FIXME split this into multiple, self-contained tests.
 
@@ -22,11 +23,10 @@
 mod other;
 
 
-// sfdgfffffffffffffffffffffffffffffffffffffffffffffffffffffff ffffffffffffffffffffffffffffffffffffffffff
+// sfdgfffffffffffffffffffffffffffffffffffffffffffffffffffffff
+// ffffffffffffffffffffffffffffffffffffffffff
 
-fn foo(a: isize, b: u32 /* blah blah */, c: f64) {
-
-}
+fn foo(a: isize, b: u32 /* blah blah */, c: f64) { }
 
 fn foo() -> Box<Write + 'static>
     where 'a: 'b,
@@ -75,8 +75,7 @@ pub fn f2(self) {
     }
 
     #[an_attribute]
-    fn f3(self) -> Dog {
-    }
+    fn f3(self) -> Dog { }
 }
 
 /// The `nodes` and `edges` method each return instantiations of
@@ -116,8 +115,7 @@ pub struct Foo<'a, Y: Baz>
     f: SomeType, // Comment beside a field
 }
 
-fn foo(ann: &'a (PpAnn + 'a)) {
-}
+fn foo(ann: &'a (PpAnn + 'a)) { }
 
 fn main() {
     for i in 0i32..4 {
@@ -141,3 +139,22 @@ fn main() {
              abcd abcd";
     let s = expand(a, b);
 }
+
+fn deconstruct()
+    -> (SocketAddr,
+        Method,
+        Headers,
+        RequestUri,
+        HttpVersion,
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA)
+{
+}
+
+fn deconstruct(foo: Bar)
+               -> (SocketAddr,
+                   Method,
+                   Headers,
+                   RequestUri,
+                   HttpVersion,
+                   AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA) {
+}