From 7556c420ab48867c04afc973a1bc5062def8ea5f Mon Sep 17 00:00:00 2001
From: Ruben Schmidmeister <ruben.schmidmeister@icloud.com>
Date: Wed, 24 Apr 2019 21:58:50 +0200
Subject: [PATCH] Use more descriptive names

---
 src/formatting/newline_style.rs | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/formatting/newline_style.rs b/src/formatting/newline_style.rs
index 1813ccad35a..7d64441bd04 100644
--- a/src/formatting/newline_style.rs
+++ b/src/formatting/newline_style.rs
@@ -41,15 +41,17 @@ const LINE_FEED: char = '\n';
 const CARRIAGE_RETURN: char = '\r';
 
 fn auto_detect_newline_style(raw_input_text: &str) -> EffectiveNewlineStyle {
-    if let Some(pos) = raw_input_text.chars().position(|ch| ch == LINE_FEED) {
-        let pos = pos.saturating_sub(1);
-        if let Some(CARRIAGE_RETURN) = raw_input_text.chars().nth(pos) {
-            EffectiveNewlineStyle::Windows
-        } else {
-            EffectiveNewlineStyle::Unix
+    let first_line_feed_pos = raw_input_text.chars().position(|ch| ch == LINE_FEED);
+    match first_line_feed_pos {
+        Some(first_line_feed_pos) => {
+            let char_before_line_feed_pos = first_line_feed_pos.saturating_sub(1);
+            let char_before_line_feed = raw_input_text.chars().nth(char_before_line_feed_pos);
+            match char_before_line_feed {
+                Some(CARRIAGE_RETURN) => EffectiveNewlineStyle::Windows,
+                _ => EffectiveNewlineStyle::Unix,
+            }
         }
-    } else {
-        native_newline_style()
+        None => native_newline_style(),
     }
 }