Merge pull request #681 from rust-lang-nursery/comment-style

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

diff --git a/tests/target/trait.rs b/tests/target/trait.rs
index 5b69c46b18d39f1f519985ece5107feab7449508..241f5d05b7c83c087d8c95d4a7ae15dd6b6cfa32 100644 (file)
--- a/tests/target/trait.rs
+++ b/tests/target/trait.rs
@@ -15,8 +15,7 @@ fn foo(a: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA, // Another comment
 
     fn increment(&mut self, x: i32);
 
-    fn read(&mut self, x: BufReader<R> /* Used to be MemReader */)
-        where R: Read;
+    fn read(&mut self, x: BufReader<R> /* Used to be MemReader */) where R: Read;
 }
 
 pub trait WriteMessage {
@@ -26,3 +25,12 @@ pub trait WriteMessage {
 trait Runnable {
     fn handler(self: &Runnable);
 }
+
+trait TraitWithExpr {
+    fn fn_with_expr(x: [i32; 1]);
+}
+
+trait Test {
+    fn read_struct<T, F>(&mut self, s_name: &str, len: usize, f: F) -> Result<T, Self::Error>
+        where F: FnOnce(&mut Self) -> Result<T, Self::Error>;
+}