[*.rs] Sort imports ; [*test*.rs] Use assert_ne! throughout

src/lib/cache.rs

@@ -7,10 +7,12 @@
 #[path = "cache_test.rs"]
 mod cache_test;
 
+use std::path::{Path, PathBuf};
+
+use fsio::file::{read_text_file, write_text_file};
+
 use crate::storage;
 use crate::types::Cache;
-use fsio::file::{read_text_file, write_text_file};
-use std::path::{Path, PathBuf};
 
 static CACHE_FILE: &'static str = "cache.toml";
 

src/lib/cache_test.rs

@@ -1,6 +1,7 @@
-use super::*;
 use std::env;
 
+use super::*;
+
 #[test]
 fn load_from_path_exists() {
     let cwd = env::current_dir().unwrap();

src/lib/cli.rs

@@ -7,6 +7,8 @@
 #[path = "cli_test.rs"]
 mod cli_test;
 
+use std::time::SystemTime;
+
 use crate::cli_commands;
 use crate::cli_parser;
 use crate::config;
@@ -22,7 +24,6 @@ use crate::time_summary;
 use crate::toolchain;
 use crate::types::{CliArgs, GlobalConfig};
 use crate::version;
-use std::time::SystemTime;
 
 pub(crate) static VERSION: &str = env!("CARGO_PKG_VERSION");
 pub(crate) static AUTHOR: &str = env!("CARGO_PKG_AUTHORS");

src/lib/cli_commands/diff_steps.rs

@@ -7,15 +7,17 @@
 #[path = "diff_steps_test.rs"]
 mod diff_steps_test;
 
+use std::fs::File;
+use std::io;
+use std::io::{BufWriter, Write};
+
+use regex::Regex;
+
 use crate::command;
 use crate::error::CargoMakeError;
 use crate::execution_plan::ExecutionPlanBuilder;
 use crate::io::{create_file, delete_file};
 use crate::types::{CliArgs, Config, CrateInfo, ExecutionPlan};
-use regex::Regex;
-use std::fs::File;
-use std::io;
-use std::io::{BufWriter, Write};
 
 fn write_as_string(execution_plan: &ExecutionPlan, file: &File) -> io::Result<()> {
     let mut writer = BufWriter::new(file);

src/lib/cli_commands/list_steps.rs

@@ -8,11 +8,12 @@
 #[path = "list_steps_test.rs"]
 mod list_steps_test;
 
+use std::collections::{BTreeMap, BTreeSet};
+
 use crate::error::CargoMakeError;
 use crate::execution_plan;
 use crate::io;
 use crate::types::{Config, DeprecationInfo};
-use std::collections::{BTreeMap, BTreeSet};
 
 pub fn run(
     config: &Config,

src/lib/cli_commands/list_steps_test.rs

@@ -1,9 +1,10 @@
-use super::*;
+use std::path::PathBuf;
 
-use crate::types::{ConfigSection, EnvValue, Task};
 use expect_test::{expect, Expect};
 use indexmap::IndexMap;
-use std::path::PathBuf;
+
+use super::*;
+use crate::types::{ConfigSection, EnvValue, Task};
 
 fn check(
     config: &Config,

src/lib/cli_commands/print_steps.rs

@@ -7,12 +7,13 @@
 #[path = "print_steps_test.rs"]
 mod print_steps_test;
 
-use crate::error::CargoMakeError;
 use std::io;
 
+use regex::Regex;
+
+use crate::error::CargoMakeError;
 use crate::execution_plan::ExecutionPlanBuilder;
 use crate::types::{Config, CrateInfo, ExecutionPlan};
-use regex::Regex;
 
 #[derive(Debug)]
 enum PrintFormat {

src/lib/cli_parser.rs

@@ -467,10 +467,11 @@ pub fn parse_args(
     args: Option<Vec<&str>>,
     spec: CliSpec,
 ) -> Result<CliArgs, CargoMakeError> {
-    let cli_parsed = match args {
+    let cli_parsed_result = match args {
         Some(args_vec) => cliparser::parse(&args_vec, &spec),
         None => cliparser::parse_process(&spec),
-    }?;
+    };
+    let cli_parsed = cli_parsed_result?;
 
     if cli_parsed.arguments.contains("help") {
         // generate help text

src/lib/cli_test.rs

@@ -1,9 +1,10 @@
-use super::*;
-use crate::cli_parser::create_cli;
-use cliparser::types::CliSpec;
 use std::env;
 use std::path::Path;
 
+use super::*;
+use crate::cli_parser::create_cli;
+
+
 #[test]
 #[ignore]
 #[should_panic]
@@ -437,7 +438,7 @@ fn run_valid() {
             "arg2",
             "arg3",
         ]),
-        create_cli(&global_config, CliSpec::new(), true),
+        create_cli(&global_config, cliparser::types::CliSpec::new(), true),
     )
     .unwrap();
 
@@ -456,7 +457,7 @@ fn run_with_global_config() {
         &"make".to_string(),
         true,
         Some(vec!["cargo", "make"]),
-        create_cli(&global_config, CliSpec::new(), true),
+        create_cli(&global_config, cliparser::types::CliSpec::new(), true),
     )
     .unwrap();
 
@@ -482,7 +483,7 @@ fn run_log_level_override() {
             "error",
             "-v",
         ]),
-        create_cli(&global_config, CliSpec::new(), true),
+        create_cli(&global_config, cliparser::types::CliSpec::new(), true),
     )
     .unwrap();
 
@@ -511,7 +512,7 @@ fn run_set_env_values() {
             "-t",
             "empty",
         ]),
-        create_cli(&global_config, CliSpec::new(), true),
+        create_cli(&global_config, cliparser::types::CliSpec::new(), true),
     )
     .unwrap();
 
@@ -543,7 +544,7 @@ fn run_set_env_via_file() {
             "-t",
             "empty",
         ]),
-        create_cli(&global_config, CliSpec::new(), true),
+        create_cli(&global_config, cliparser::types::CliSpec::new(), true),
     );
 
     envmnt::set("ENV1_TEST", "EMPTY");
@@ -580,7 +581,7 @@ fn run_set_env_both() {
             "-t",
             "empty",
         ]),
-        create_cli(&global_config, CliSpec::new(), true),
+        create_cli(&global_config, cliparser::types::CliSpec::new(), true),
     );
 
     envmnt::set("ENV1_TEST", "EMPTY");
@@ -624,7 +625,7 @@ fn run_print_only() {
             "--print-steps",
             "--experimental",
         ]),
-        create_cli(&global_config, CliSpec::new(), true),
+        create_cli(&global_config, cliparser::types::CliSpec::new(), true),
     );
 
     run(&cli_args.unwrap(), &global_config).unwrap();
@@ -650,7 +651,7 @@ fn run_diff_steps() {
             "--no-workspace",
             "--diff-steps",
         ]),
-        create_cli(&global_config, CliSpec::new(), true),
+        create_cli(&global_config, cliparser::types::CliSpec::new(), true),
     );
 
     run(&cli_args.unwrap(), &global_config).unwrap();
@@ -671,7 +672,7 @@ fn run_protected_flow_example() {
             "--makefile",
             "./examples/on_error.toml",
         ]),
-        create_cli(&global_config, CliSpec::new(), true),
+        create_cli(&global_config, cliparser::types::CliSpec::new(), true),
     );
 
     run(&cli_args.unwrap(), &global_config).unwrap();
@@ -691,7 +692,7 @@ fn run_no_task_args() {
             "--disable-check-for-updates",
             "empty",
         ]),
-        create_cli(&global_config, CliSpec::new(), true),
+        create_cli(&global_config, cliparser::types::CliSpec::new(), true),
     );
 
     envmnt::set("CARGO_MAKE_TASK_ARGS", "EMPTY");
@@ -718,7 +719,7 @@ fn run_set_task_args() {
             "arg2",
             "arg3",
         ]),
-        create_cli(&global_config, CliSpec::new(), true),
+        create_cli(&global_config, cliparser::types::CliSpec::new(), true),
     );
 
     envmnt::set("CARGO_MAKE_TASK_ARGS", "EMPTY");
@@ -742,7 +743,7 @@ fn run_set_task_var_args() {
         Some(vec![
             "cargo", "make", "empty", "abc", "-p", "foo/bar/", "def",
         ]),
-        create_cli(&global_config, CliSpec::new(), true),
+        create_cli(&global_config, cliparser::types::CliSpec::new(), true),
     )
     .unwrap();
 

src/lib/command.rs

@@ -7,17 +7,19 @@
 #[path = "command_test.rs"]
 mod command_test;
 
-use crate::error::CargoMakeError;
-use crate::logger;
-use crate::toolchain;
-use crate::types::{CommandSpec, Step, UnstableFeature};
-use run_script::{IoOptions, ScriptError, ScriptOptions};
 use std::io;
 use std::io::{Error, ErrorKind, Read};
 use std::process::{Command, ExitStatus, Output, Stdio};
 use std::sync::atomic::{AtomicU32, Ordering};
 use std::sync::Once;
 
+use run_script::{IoOptions, ScriptError, ScriptOptions};
+
+use crate::error::CargoMakeError;
+use crate::logger;
+use crate::toolchain;
+use crate::types::{CommandSpec, Step, UnstableFeature};
+
 /// Returns the exit code (-1 if no exit code found)
 pub(crate) fn get_exit_code(exit_status: Result<ExitStatus, Error>, force: bool) -> i32 {
     match exit_status {

src/lib/condition.rs

@@ -7,6 +7,13 @@
 #[path = "condition_test.rs"]
 mod condition_test;
 
+use std::path::Path;
+
+use fsio::path::from_path::FromPath;
+use glob::glob;
+use indexmap::IndexMap;
+use rust_info::types::{RustChannel, RustInfo};
+
 use crate::environment;
 use crate::error::CargoMakeError;
 use crate::profile;
@@ -17,11 +24,6 @@ use crate::types::{
     TaskCondition,
 };
 use crate::version::{is_newer, is_same};
-use fsio::path::from_path::FromPath;
-use glob::glob;
-use indexmap::IndexMap;
-use rust_info::types::{RustChannel, RustInfo};
-use std::path::Path;
 
 fn validate_env_map(
     env: Option<IndexMap<String, String>>,

src/lib/condition_test.rs

@@ -1,8 +1,10 @@
+use std::{thread, time::Duration};
+
+use git_info::types::GitInfo;
+
 use super::*;
 use crate::test::{get_temp_test_directory, should_test_unstable};
 use crate::types::{Config, ConfigSection, CrateInfo, EnvInfo, FilesFilesModifiedCondition, Task};
-use git_info::types::GitInfo;
-use std::{thread, time::Duration};
 
 fn setup_test_dir(subdir: &str) -> String {
     let pathbuf = get_temp_test_directory(subdir);

src/lib/config.rs

@@ -7,12 +7,14 @@
 #[path = "config_test.rs"]
 mod config_test;
 
+use std::path::{Path, PathBuf};
+
+use fsio::file::read_text_file;
+use fsio::path::from_path::FromPath;
+
 use crate::error::CargoMakeError;
 use crate::storage;
 use crate::types::GlobalConfig;
-use fsio::file::read_text_file;
-use fsio::path::from_path::FromPath;
-use std::path::{Path, PathBuf};
 
 pub static CONFIG_FILE: &'static str = "config.toml";
 

src/lib/config_test.rs

@@ -1,6 +1,7 @@
-use super::*;
 use std::env;
 
+use super::*;
+
 #[test]
 fn load_from_path_exists() {
     let path: PathBuf = ["examples", "cargo-make"].iter().collect();

src/lib/descriptor/cargo_alias.rs

@@ -7,11 +7,12 @@
 #[path = "cargo_alias_test.rs"]
 mod cargo_alias_test;
 
+use std::collections::HashMap;
+use std::path::Path;
+
 use crate::error::CargoMakeError;
 use crate::io;
 use crate::types::{InstallCrate, Task};
-use std::collections::HashMap;
-use std::path::Path;
 
 #[derive(Serialize, Deserialize, Debug)]
 #[serde(untagged)]

src/lib/descriptor/makefiles/mod_test.rs

@@ -1,3 +1,9 @@
+use std::cell::RefCell;
+use std::rc::Rc;
+
+use git_info::types::GitInfo;
+use rust_info::types::RustInfo;
+
 use crate::condition;
 use crate::descriptor;
 use crate::error::CargoMakeError;
@@ -6,10 +12,6 @@ use crate::scriptengine;
 use crate::scriptengine::EngineType;
 use crate::test;
 use crate::types::{Config, CrateInfo, EnvInfo, FlowInfo, FlowState, RunTaskInfo, Step, Task};
-use git_info::types::GitInfo;
-use rust_info::types::RustInfo;
-use std::cell::RefCell;
-use std::rc::Rc;
 
 fn load_descriptor() -> Result<Config, CargoMakeError> {
     descriptor::load_internal_descriptors(true, false, None)

src/lib/environment/crateinfo.rs

@@ -7,16 +7,18 @@
 #[path = "crateinfo_test.rs"]
 mod crateinfo_test;
 
-use crate::error::CargoMakeError;
-use crate::types::{CrateDependency, CrateInfo, PackageInfo, Workspace};
+use std::env;
+use std::ffi::OsStr;
+use std::path::{Path, PathBuf};
+
 use cargo_metadata::camino::Utf8PathBuf;
 use cargo_metadata::{Metadata, MetadataCommand};
 use glob::glob;
 use indexmap::IndexMap;
 use itertools::Itertools;
-use std::env;
-use std::ffi::OsStr;
-use std::path::{Path, PathBuf};
+
+use crate::error::CargoMakeError;
+use crate::types::{CrateDependency, CrateInfo, PackageInfo, Workspace};
 
 #[derive(Debug, Deserialize)]
 struct CargoConfig {