From 314aff1a33c2174e8b52a7a80fc9104dd0686237 Mon Sep 17 00:00:00 2001
From: Kevin Yeh <kevinyeah@utexas.edu>
Date: Wed, 25 Nov 2015 22:25:02 -0600
Subject: [PATCH] Reformat trim_newlines
---
src/utils.rs | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/utils.rs b/src/utils.rs
index aaa838bf043..b1bbb860edb 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -144,12 +144,12 @@ pub fn semicolon_for_stmt(stmt: &ast::Stmt) -> bool {
#[inline]
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;
- if start == 0 && end == 1 {
- input
- } else {
- &input[start..end]
+ match input.find(|c| c != '\n' && c != '\r') {
+ Some(start) => {
+ let end = input.rfind(|c| c != '\n' && c != '\r').unwrap_or(0) + 1;
+ &input[start..end]
+ }
+ None => "",
}
}