Support single-line functions

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

diff --git a/tests/target/multiple.rs b/tests/target/multiple.rs
index 0fb0c94e3a8319c1a576f09e86439cacc99b329e..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.
 
@@ -14,22 +15,20 @@
 extern crate foo;
 
 use std::cell::*;
-use std::{self, any, ascii, borrow, boxed, char, borrow, boxed, char, borrow,
-          borrow, boxed, char, borrow, boxed, char, borrow, boxed, char,
-          borrow, boxed, char, borrow, boxed, char, borrow, boxed, char,
-          borrow, boxed, char, borrow, boxed, char};
+use std::{self, any, ascii, borrow, boxed, char, borrow, boxed, char, borrow, borrow, boxed, char,
+          borrow, boxed, char, borrow, boxed, char, borrow, boxed, char, borrow, boxed, char,
+          borrow, boxed, char, borrow, boxed, char, borrow, boxed, char};
 
 mod doc;
 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()
+fn foo() -> Box<Write + 'static>
     where 'a: 'b,
           for<'a> D<'b>: 'a
 {
@@ -65,8 +64,7 @@ fn qux(a: dadsfa,   // Comment 1
 /// Blah blah blah.
 impl Bar {
     fn foo(&mut self,
-           a: sdfsdfcccccccccccccccccccccccccccccccccccccccccccccccccc, /* commen
-                                                                         * t on a */
+           a: sdfsdfcccccccccccccccccccccccccccccccccccccccccccccccccc, // comment on a
            b: sdfasdfsdfasfs /* closing comment */)
            -> isize {
     }
@@ -77,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
@@ -118,6 +115,8 @@ pub struct Foo<'a, Y: Baz>
     f: SomeType, // Comment beside a field
 }
 
+fn foo(ann: &'a (PpAnn + 'a)) { }
+
 fn main() {
     for i in 0i32..4 {
         println!("{}", i);
@@ -135,7 +134,27 @@ fn main() {
                        42usize);
     let rc = RefCell::new(42usize, remaining_width, remaining_width);  // a comment
     let x = "Hello!!!!!!!!! abcd  abcd abcd abcd abcd abcd\n abcd abcd abcd abcd abcd abcd abcd \
-             abcd abcd abcd  abcd abcd abcd abcd abcd abcd abcd abcd abcd abcd abcd abcd abcd abcd \
+             abcd abcd abcd  abcd abcd abcd abcd abcd abcd abcd abcd abcd abcd abcd abcd abcd \
              abcd abcd abcd abcd abcd abcd abcd abcd abcd abcd abcd abcd abcd abcd abcd abcd abcd \
-             abcd";
+             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) {
 }