From 7f7e8465da7e558d5acbfdf56bc3186c21b3b65a Mon Sep 17 00:00:00 2001
From: Saeed Rasooli <saeed.gnu@gmail.com>
Date: Tue, 9 Feb 2021 08:16:10 +0330
Subject: [PATCH] Fix fmt and small cleaning in nu-parser (#3033)

* parse_unit: reduce indentation in loop

* fix fmt: crates/nu-parser/src/lex/tests.rs
---
 crates/nu-parser/src/lex/tests.rs |  5 ++++-
 crates/nu-parser/src/parse.rs     | 37 +++++++++++++++----------------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/crates/nu-parser/src/lex/tests.rs b/crates/nu-parser/src/lex/tests.rs
index 73941af0..adca6718 100644
--- a/crates/nu-parser/src/lex/tests.rs
+++ b/crates/nu-parser/src/lex/tests.rs
@@ -218,7 +218,10 @@ mod lite_parse {
     #[test]
     fn incomplete_result() {
         let (result, err) = lex("my_command \"foo' --test", 10);
-        assert!(matches!(err.unwrap().reason(), nu_errors::ParseErrorReason::Eof { .. }));
+        assert!(matches!(
+            err.unwrap().reason(),
+            nu_errors::ParseErrorReason::Eof { .. }
+        ));
         let (result, _) = block(result);
 
         assert_eq!(result.block.len(), 1);
diff --git a/crates/nu-parser/src/parse.rs b/crates/nu-parser/src/parse.rs
index a0122c22..3054734e 100644
--- a/crates/nu-parser/src/parse.rs
+++ b/crates/nu-parser/src/parse.rs
@@ -346,27 +346,26 @@ fn parse_unit(lite_arg: &Spanned<String>) -> (SpannedExpression, Option<ParseErr
 
     for unit_group in unit_groups.iter() {
         for unit in unit_group.1.iter() {
-            if lite_arg.item.ends_with(unit) {
-                let mut lhs = lite_arg.item.clone();
+            if !lite_arg.item.ends_with(unit) {
+                continue;
+            }
+            let mut lhs = lite_arg.item.clone();
 
-                for _ in 0..unit.len() {
-                    lhs.pop();
-                }
+            for _ in 0..unit.len() {
+                lhs.pop();
+            }
 
-                // these units are allowed to be signed
-                if let Ok(x) = lhs.parse::<i64>() {
-                    let lhs_span =
-                        Span::new(lite_arg.span.start(), lite_arg.span.start() + lhs.len());
-                    let unit_span =
-                        Span::new(lite_arg.span.start() + lhs.len(), lite_arg.span.end());
-                    return (
-                        SpannedExpression::new(
-                            Expression::unit(x.spanned(lhs_span), unit_group.0.spanned(unit_span)),
-                            lite_arg.span,
-                        ),
-                        None,
-                    );
-                }
+            // these units are allowed to be signed
+            if let Ok(x) = lhs.parse::<i64>() {
+                let lhs_span = Span::new(lite_arg.span.start(), lite_arg.span.start() + lhs.len());
+                let unit_span = Span::new(lite_arg.span.start() + lhs.len(), lite_arg.span.end());
+                return (
+                    SpannedExpression::new(
+                        Expression::unit(x.spanned(lhs_span), unit_group.0.spanned(unit_span)),
+                        lite_arg.span,
+                    ),
+                    None,
+                );
             }
         }
     }