Fix empty trim_newline panic, add impl macro test

kyeah · Nov 24, 2015 · f5fac4c · nrc · Nov 26, 2015 · f5fac4c
1 parent c408245
commit f5fac4c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/src/utils.rs b/src/utils.rs
@@ -146,7 +146,11 @@ pub fn semicolon_for_stmt(stmt: &ast::Stmt) -> bool {
 pub fn trim_newlines(input: &str) -> &str {
     let start = input.find(|c| c != '\n' && c != '\r').unwrap_or(0);
     let end = input.rfind(|c| c != '\n' && c != '\r').unwrap_or(0) + 1;
-    &input[start..end]
+    if start == 0 && end == 1 {
+        input
+    } else {
+        &input[start..end]
+    }
 }
 
 #[inline]

diff --git a/tests/source/impls.rs b/tests/source/impls.rs
@@ -51,3 +51,10 @@ mod b {
         }
     }
 }
+
+impl Foo { add_fun!(); }
+
+impl Blah {
+    fn boop() {}
+    add_fun!();
+}
diff --git a/tests/target/impls.rs b/tests/target/impls.rs
@@ -63,3 +63,12 @@ mod b {
         }
     }
 }
+
+impl Foo {
+    add_fun!();
+}
+
+impl Blah {
+    fn boop() {}
+    add_fun!();
+}