Per review comment - add test cases from rust-lang#4649

Author: davidBar-On

src/items.rs

@@ -2418,7 +2418,7 @@ fn rewrite_fn_base(
             result.push_str(&ret_str);
         }
 
-        // Clusure to handle a comment in a snippet
+        // Closure to handle a comment in a snippet
         let mut snippet_comment_handling = |span_lo, span_hi, consider_force_new_line_for_brace| {
             let snippet = context.snippet(mk_sp(span_lo, span_hi));
             // Try to preserve the layout of the original snippet.

tests/source/issue-5407/one.rs

@@ -15,6 +15,23 @@ String::new()
 }
 }
 
+// Original from #4649
+trait Foo {
+    fn bar(&self)
+    where
+    //     Self: Bar
+    // Some comment
+    ;
+}
+
+fn foo<T>()
+where
+//     T: Bar,
+// Some comment
+{
+    println!("foo");
+}
+
 // Return-type with no "where" - one comment
 fn main () {
 fn foo1() -> String /* same-line with ret-type and brace comment */ {

tests/source/issue-5407/two.rs

@@ -15,6 +15,23 @@ String::new()
 }
 }
 
+// Original from #4649
+trait Foo {
+fn bar(&self)
+where
+//     Self: Bar
+// Some comment
+;
+}
+
+fn foo<T>()
+where
+//     T: Bar,
+// Some comment
+{
+println!("foo");
+}
+    
 // Return-type with no "where" - one comment
 fn main () {
 fn foo1() -> String /* same-line with ret-type and brace comment */ {

tests/target/issue-5407/one.rs

@@ -13,6 +13,21 @@ mod inner {
     }
 }
 
+// Original from #4649
+trait Foo {
+    fn bar(&self)
+    //     Self: Bar
+    // Some comment
+    ;
+}
+
+fn foo<T>()
+//     T: Bar,
+// Some comment
+{
+    println!("foo");
+}
+
 // Return-type with no "where" - one comment
 fn main() {
     fn foo1() -> String /* same-line with ret-type and brace comment */ {}

tests/target/issue-5407/two.rs

@@ -13,6 +13,21 @@ mod inner {
     }
 }
 
+// Original from #4649
+trait Foo {
+    fn bar(&self)
+    //     Self: Bar
+    // Some comment
+    ;
+}
+
+fn foo<T>()
+//     T: Bar,
+// Some comment
+{
+    println!("foo");
+}
+
 // Return-type with no "where" - one comment
 fn main() {
     fn foo1() -> String /* same-line with ret-type and brace comment */ {}