From 9fda0e8b6925747cdf7461700f0b2416aee4c652 Mon Sep 17 00:00:00 2001
From: Phodal Huang <h@phodal.com>
Date: Mon, 7 Sep 2020 20:07:52 +0800
Subject: [PATCH] fix: fix lint issues

---
 scie-grammar/src/grammar/grammar.rs       |  5 ++---
 scie-grammar/src/grammar/stack_element.rs |  4 +---
 scie-grammar/src/rule/mod.rs              |  6 ++----
 scie-grammar/src/rule/reg_exp_source.rs   |  2 +-
 scie-scanner/src/scanner/scanner.rs       | 17 +++++++++++------
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/scie-grammar/src/grammar/grammar.rs b/scie-grammar/src/grammar/grammar.rs
index b28ac4a..90c8b88 100644
--- a/scie-grammar/src/grammar/grammar.rs
+++ b/scie-grammar/src/grammar/grammar.rs
@@ -545,7 +545,8 @@ impl Grammar {
     ) {
         let match_result =
             self.match_rule(line_text, is_first_line, line_pos, stack, anchor_position);
-        if let Some(_result) = match_result {} else {
+        if let Some(_result) = match_result {
+        } else {
             // None
         };
         // todo: get injections logic
@@ -762,7 +763,6 @@ hellomake: $(OBJ)
         debug_output(&grammar, String::from("program.json"));
     }
 
-
     #[test]
     fn should_resolve_make_file_error_issues2() {
         let code = "hellomake: $(OBJ)
@@ -800,5 +800,4 @@ hellomake: $(OBJ)
         }
         grammar
     }
-
 }
diff --git a/scie-grammar/src/grammar/stack_element.rs b/scie-grammar/src/grammar/stack_element.rs
index 8935879..1aaac35 100644
--- a/scie-grammar/src/grammar/stack_element.rs
+++ b/scie-grammar/src/grammar/stack_element.rs
@@ -111,7 +111,5 @@ impl StackElement {
         return self;
     }
 
-    pub fn reset(&mut self) {
-
-    }
+    pub fn reset(&mut self) {}
 }
diff --git a/scie-grammar/src/rule/mod.rs b/scie-grammar/src/rule/mod.rs
index 429d922..c863351 100644
--- a/scie-grammar/src/rule/mod.rs
+++ b/scie-grammar/src/rule/mod.rs
@@ -46,7 +46,5 @@ pub trait IRuleFactoryHelper: IGrammarRegistry + IRuleRegistry {}
 #[cfg(test)]
 mod tests {
     #[test]
-    fn should_build_json_code() {
-
-    }
-}
\ No newline at end of file
+    fn should_build_json_code() {}
+}
diff --git a/scie-grammar/src/rule/reg_exp_source.rs b/scie-grammar/src/rule/reg_exp_source.rs
index 553f2d9..410bc85 100644
--- a/scie-grammar/src/rule/reg_exp_source.rs
+++ b/scie-grammar/src/rule/reg_exp_source.rs
@@ -76,7 +76,7 @@ impl RegExpSourceList {
                 let compiled_rule = CompiledRule::new(reg_exps, rules);
                 self._cached = Some(compiled_rule.clone());
             };
-            return self._cached.clone().unwrap()
+            return self._cached.clone().unwrap();
         } else {
             println!("// todo: cached {:?}", self._items);
         }
diff --git a/scie-scanner/src/scanner/scanner.rs b/scie-scanner/src/scanner/scanner.rs
index 8d8a0a3..c8ad4ce 100644
--- a/scie-scanner/src/scanner/scanner.rs
+++ b/scie-scanner/src/scanner/scanner.rs
@@ -120,7 +120,7 @@ where
 
 #[cfg(test)]
 mod tests {
-    use crate::scanner::scanner::{str_vec_to_string, IOnigMatch, Scanner};
+    use crate::scanner::scanner::{str_vec_to_string, Scanner};
 
     #[test]
     fn should_handle_simple_regex() {
@@ -320,7 +320,7 @@ mod tests {
             "^(ifdef|ifndef)\\s*([^\\s]+)(?=\\s)",
             "^(ifeq|ifneq)(?=\\s)]",
         ];
-        let rules = vec![2, 7, 28, 45, 48, 51, 61, 64, 66, 69, 77];
+        let _rules = vec![2, 7, 28, 45, 48, 51, 61, 64, 66, 69, 77];
         let debug_regex = str_vec_to_string(origin);
         let mut scanner = Scanner::new(debug_regex);
         let result = scanner.find_next_match_sync(String::from("%.o: %.c $(DEPS)"), 0);
@@ -330,7 +330,7 @@ mod tests {
     #[test]
     fn should_match_makefile_special_char() {
         let origin = vec!["(?=\\s|$)", "(\\$?\\$)[@%<?^+*]", "\\$?\\$\\(", "%"];
-        let rules = vec![-1, 12, 14, 33];
+        let _rules = vec![-1, 12, 14, 33];
         let debug_regex = str_vec_to_string(origin);
         let mut scanner = Scanner::new(debug_regex);
         let result = scanner.find_next_match_sync(String::from("%.o"), 0);
@@ -343,11 +343,16 @@ mod tests {
     #[test]
     fn should_match_for_scope_target() {
         let origin = vec!["^(?!\\t)", "\\G", "^\\t"];
-        let rules = vec![-1, 36, 39];
+        let _rules = vec![-1, 36, 39];
         let debug_regex = str_vec_to_string(origin);
         let mut scanner = Scanner::new(debug_regex);
-        let result = scanner.find_next_match_sync(String::from("%.o: %.c $(DEPS)
-"), 4);
+        let result = scanner.find_next_match_sync(
+            String::from(
+                "%.o: %.c $(DEPS)
+",
+            ),
+            4,
+        );
         let onig_match = result.unwrap();
         assert_eq!(1, onig_match.index);
         assert_eq!(4, onig_match.capture_indices[0].start);
-- 
GitLab