拆分util文件

src/commands/branch.rs

@@ -126,7 +126,7 @@ pub fn branch(
 #[cfg(test)]
 mod test {
     use super::*;
-    use crate::{commands, utils::util::test_util};
+    use crate::{commands, utils::test_util};
     #[test]
     fn test_create_branch() {
         test_util::setup_test_with_clean_mit();

src/commands/commit.rs

@@ -40,7 +40,7 @@ mod test {
 
     use crate::{
         commands as cmd, models,
-        utils::{head, util::test_util},
+        utils::{head, test_util},
     };
 
     #[test]

src/commands/log.rs

@@ -70,7 +70,7 @@ fn __log(all: bool, number: Option<usize>) -> usize {
 #[cfg(test)]
 mod test {
     use super::super::super::commands;
-    use crate::utils::util::test_util;
+    use crate::utils::test_util;
     #[test]
     fn test_log() {
         test_util::setup_test_with_clean_mit();

src/commands/merge.rs

@@ -80,12 +80,10 @@ pub fn merge(branch: String) {
 
 #[cfg(test)]
 mod test {
-    use std::fs;
-
     use super::*;
     use crate::{
         commands::{commit, switch::switch},
-        utils::util::test_util,
+        utils::test_util,
     };
 
     #[test]

src/commands/restore.rs

@@ -216,7 +216,7 @@ pub fn restore(paths: Vec<String>, source: Option<String>, worktree: bool, stage
 mod test {
     use std::fs;
     //TODO 写测试！
-    use crate::{commands as cmd, commands::status, models::Index, utils::util::test_util};
+    use crate::{commands as cmd, commands::status, models::Index, utils::test_util};
     use std::path::PathBuf;
 
     #[test]

src/commands/status.rs

@@ -196,7 +196,7 @@ pub fn status() {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{commands as cmd, utils::util::test_util};
+    use crate::{commands as cmd, utils::test_util};
     use std::path::Path;
 
     #[test]

src/commands/switch.rs

@@ -88,7 +88,7 @@ mod test {
     use super::*;
     use crate::{
         commands::{self as cmd},
-        utils::util::test_util,
+        utils::test_util,
     };
     use std::path::PathBuf;
     #[test]