rebase main

Signed-off-by: junxiang Mu <1948535941@qq.com>

ecstore/src/utils/bool_flag.rs

@@ -2,14 +2,14 @@ use crate::error::{Error, Result};
 
 pub fn parse_bool(str: &str) -> Result<bool> {
     match str {
-        "1"| "t"| "T"| "true"| "TRUE"| "True"| "on"| "ON"| "On"| "enabled" => {
+        "1" | "t" | "T" | "true" | "TRUE" | "True" | "on" | "ON" | "On" | "enabled" => {
             return Ok(true);
-        },
-        "0"| "f"| "F"| "false"| "FALSE"| "False"| "off"| "OFF"| "Off"| "disabled" => {
+        }
+        "0" | "f" | "F" | "false" | "FALSE" | "False" | "off" | "OFF" | "Off" | "disabled" => {
             return Ok(false);
         }
         _ => {
             return Err(Error::from_string(format!("ParseBool: parsing {}", str)));
         }
     }
-}
+}

ecstore/src/utils/mod.rs

@@ -1,6 +1,6 @@
+pub mod bool_flag;
 pub mod crypto;
 pub mod ellipses;
-pub mod bool_flag;
 pub mod fs;
 pub mod hash;
 pub mod net;