From 2f988a9d664261c4e42ce6c511f5ced84d95444d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Kav=C3=ADk?= <martin@kavik.cz>
Date: Sun, 28 Mar 2021 20:53:56 +0200
Subject: [PATCH 1/3] fix: enable ansi support for Windows

---
 Cargo.toml     | 3 +++
 src/lib/mod.rs | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/Cargo.toml b/Cargo.toml
index 9547cd9d..476504ca 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -67,6 +67,9 @@ serde_ignored = "^0.1"
 shell2batch = "^0.4.2"
 toml = "^0.5"
 
+[target.'cfg(windows)'.dependencies]
+ansi_term = "0.12.1"
+
 [dev-dependencies]
 rusty-hook = "^0.11"
 
diff --git a/src/lib/mod.rs b/src/lib/mod.rs
index 9bd2ac4a..5bff99f0 100755
--- a/src/lib/mod.rs
+++ b/src/lib/mod.rs
@@ -195,5 +195,9 @@ mod version;
 
 /// Handles the command line arguments and executes the runner.
 pub fn run_cli(command_name: String, sub_command: bool) {
+    #[cfg(windows)]
+    if let Err(err) = ansi_term::enable_ansi_support() {
+        eprintln!("error enabling ANSI support: {:?}", err);
+    }
     cli::run_cli(command_name, sub_command)
 }

From 12986729587bc108f3c70879f41f68c30579058d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Kav=C3=ADk?= <martin@kavik.cz>
Date: Mon, 29 Mar 2021 13:10:50 +0200
Subject: [PATCH 2/3] chore: make ci-flow Windows-compatible

---
 .github/CONTRIBUTING.md                         | 5 +++++
 src/lib/cache.rs                                | 2 +-
 src/lib/cli.rs                                  | 2 +-
 src/lib/cli_commands/diff_steps.rs              | 2 +-
 src/lib/cli_commands/list_steps.rs              | 2 +-
 src/lib/cli_commands/print_steps.rs             | 2 +-
 src/lib/command.rs                              | 2 +-
 src/lib/condition.rs                            | 2 +-
 src/lib/config.rs                               | 2 +-
 src/lib/descriptor/cargo_alias.rs               | 2 +-
 src/lib/descriptor/descriptor_deserializer.rs   | 2 +-
 src/lib/descriptor/makefiles/mod.rs             | 2 +-
 src/lib/descriptor/mod.rs                       | 2 +-
 src/lib/environment/crateinfo.rs                | 2 +-
 src/lib/environment/mod.rs                      | 2 +-
 src/lib/execution_plan.rs                       | 2 +-
 src/lib/functions/decode_func.rs                | 2 +-
 src/lib/functions/getat_func.rs                 | 2 +-
 src/lib/functions/mod.rs                        | 2 +-
 src/lib/functions/remove_empty_func.rs          | 2 +-
 src/lib/functions/split_func.rs                 | 2 +-
 src/lib/functions/trim_func.rs                  | 2 +-
 src/lib/installer/cargo_plugin_installer.rs     | 2 +-
 src/lib/installer/crate_installer.rs            | 2 +-
 src/lib/installer/crate_version_check.rs        | 2 +-
 src/lib/installer/mod.rs                        | 2 +-
 src/lib/installer/rustup_component_installer.rs | 2 +-
 src/lib/io.rs                                   | 2 +-
 src/lib/legacy.rs                               | 2 +-
 src/lib/logger.rs                               | 2 +-
 src/lib/profile.rs                              | 2 +-
 src/lib/proxy_task.rs                           | 2 +-
 src/lib/recursion_level.rs                      | 2 +-
 src/lib/runner.rs                               | 2 +-
 src/lib/scriptengine/duck_script/mod.rs         | 2 +-
 src/lib/scriptengine/generic_script.rs          | 2 +-
 src/lib/scriptengine/mod.rs                     | 2 +-
 src/lib/scriptengine/os_script.rs               | 2 +-
 src/lib/scriptengine/rsscript.rs                | 2 +-
 src/lib/scriptengine/script_utils.rs            | 2 +-
 src/lib/scriptengine/shebang_script.rs          | 2 +-
 src/lib/scriptengine/shell_to_batch.rs          | 2 +-
 src/lib/storage.rs                              | 2 +-
 src/lib/toolchain.rs                            | 2 +-
 src/lib/types.rs                                | 2 +-
 src/lib/version.rs                              | 2 +-
 src/main.rs                                     | 2 +-
 src/makers.rs                                   | 2 +-
 48 files changed, 52 insertions(+), 47 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 7fb2aee1..e6ec1fb6 100755
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -22,3 +22,8 @@ cargo make ci-flow
 ````
 
 * There are many automatic unit tests as part of the library which provide full coverage of the functionality.<br>Any fix/enhancement must come with a set of tests to ensure it's working well.
+
+- _For Windows users_: You need to allow to run PowerShell scripts (see [About Execution Policies](https:/go.microsoft.com/fwlink/?LinkID=135170) for more info). Run in PS:
+    ```ps
+    Set-ExecutionPolicy -ExecutionPolicy Unrestricted -Scope CurrentUser
+    ```
diff --git a/src/lib/cache.rs b/src/lib/cache.rs
index eb45bede..bbec3ac0 100644
--- a/src/lib/cache.rs
+++ b/src/lib/cache.rs
@@ -4,7 +4,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./cache_test.rs"]
+#[path = "cache_test.rs"]
 mod cache_test;
 
 use crate::storage;
diff --git a/src/lib/cli.rs b/src/lib/cli.rs
index 405f7f64..548ee55d 100644
--- a/src/lib/cli.rs
+++ b/src/lib/cli.rs
@@ -4,7 +4,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./cli_test.rs"]
+#[path = "cli_test.rs"]
 mod cli_test;
 
 use crate::cli_commands;
diff --git a/src/lib/cli_commands/diff_steps.rs b/src/lib/cli_commands/diff_steps.rs
index 45b73d41..cd2ac023 100644
--- a/src/lib/cli_commands/diff_steps.rs
+++ b/src/lib/cli_commands/diff_steps.rs
@@ -4,7 +4,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./diff_steps_test.rs"]
+#[path = "diff_steps_test.rs"]
 mod diff_steps_test;
 
 use crate::command;
diff --git a/src/lib/cli_commands/list_steps.rs b/src/lib/cli_commands/list_steps.rs
index 8b2c8d1e..2eecc03b 100644
--- a/src/lib/cli_commands/list_steps.rs
+++ b/src/lib/cli_commands/list_steps.rs
@@ -4,7 +4,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./list_steps_test.rs"]
+#[path = "list_steps_test.rs"]
 mod list_steps_test;
 
 use crate::execution_plan;
diff --git a/src/lib/cli_commands/print_steps.rs b/src/lib/cli_commands/print_steps.rs
index 7a3c98c9..7202433f 100644
--- a/src/lib/cli_commands/print_steps.rs
+++ b/src/lib/cli_commands/print_steps.rs
@@ -4,7 +4,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./print_steps_test.rs"]
+#[path = "print_steps_test.rs"]
 mod print_steps_test;
 
 use crate::execution_plan::create as create_execution_plan;
diff --git a/src/lib/command.rs b/src/lib/command.rs
index cc03d29a..932d5d06 100755
--- a/src/lib/command.rs
+++ b/src/lib/command.rs
@@ -4,7 +4,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./command_test.rs"]
+#[path = "command_test.rs"]
 mod command_test;
 
 use crate::logger;
diff --git a/src/lib/condition.rs b/src/lib/condition.rs
index c1a2efc6..c968815e 100755
--- a/src/lib/condition.rs
+++ b/src/lib/condition.rs
@@ -4,7 +4,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./condition_test.rs"]
+#[path = "condition_test.rs"]
 mod condition_test;
 
 use crate::command;
diff --git a/src/lib/config.rs b/src/lib/config.rs
index 5646323f..a86e46d6 100644
--- a/src/lib/config.rs
+++ b/src/lib/config.rs
@@ -4,7 +4,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./config_test.rs"]
+#[path = "config_test.rs"]
 mod config_test;
 
 use crate::storage;
diff --git a/src/lib/descriptor/cargo_alias.rs b/src/lib/descriptor/cargo_alias.rs
index dc0eeb80..e7a5653d 100644
--- a/src/lib/descriptor/cargo_alias.rs
+++ b/src/lib/descriptor/cargo_alias.rs
@@ -4,7 +4,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./cargo_alias_test.rs"]
+#[path = "cargo_alias_test.rs"]
 mod cargo_alias_test;
 
 use crate::io;
diff --git a/src/lib/descriptor/descriptor_deserializer.rs b/src/lib/descriptor/descriptor_deserializer.rs
index a23bcfee..135f910f 100644
--- a/src/lib/descriptor/descriptor_deserializer.rs
+++ b/src/lib/descriptor/descriptor_deserializer.rs
@@ -3,7 +3,7 @@
 //! Deserializes and validates the configs.
 
 #[cfg(test)]
-#[path = "./descriptor_deserializer_test.rs"]
+#[path = "descriptor_deserializer_test.rs"]
 mod descriptor_deserializer_test;
 
 use crate::types::{Config, ExternalConfig};
diff --git a/src/lib/descriptor/makefiles/mod.rs b/src/lib/descriptor/makefiles/mod.rs
index c7163359..2acc08c5 100644
--- a/src/lib/descriptor/makefiles/mod.rs
+++ b/src/lib/descriptor/makefiles/mod.rs
@@ -4,7 +4,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./mod_test.rs"]
+#[path = "mod_test.rs"]
 mod mod_test;
 
 pub(crate) static BASE: &str = include_str!("base.toml");
diff --git a/src/lib/descriptor/mod.rs b/src/lib/descriptor/mod.rs
index f962ab1d..67695a83 100755
--- a/src/lib/descriptor/mod.rs
+++ b/src/lib/descriptor/mod.rs
@@ -7,7 +7,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./mod_test.rs"]
+#[path = "mod_test.rs"]
 mod mod_test;
 
 mod cargo_alias;
diff --git a/src/lib/environment/crateinfo.rs b/src/lib/environment/crateinfo.rs
index c1969ca1..00471e96 100755
--- a/src/lib/environment/crateinfo.rs
+++ b/src/lib/environment/crateinfo.rs
@@ -4,7 +4,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./crateinfo_test.rs"]
+#[path = "crateinfo_test.rs"]
 mod crateinfo_test;
 
 use crate::command;
diff --git a/src/lib/environment/mod.rs b/src/lib/environment/mod.rs
index 805bc588..ecad5579 100644
--- a/src/lib/environment/mod.rs
+++ b/src/lib/environment/mod.rs
@@ -6,7 +6,7 @@
 pub(crate) mod crateinfo;
 
 #[cfg(test)]
-#[path = "./mod_test.rs"]
+#[path = "mod_test.rs"]
 mod mod_test;
 
 use crate::command;
diff --git a/src/lib/execution_plan.rs b/src/lib/execution_plan.rs
index 6b90928c..b5525c6c 100644
--- a/src/lib/execution_plan.rs
+++ b/src/lib/execution_plan.rs
@@ -4,7 +4,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./execution_plan_test.rs"]
+#[path = "execution_plan_test.rs"]
 mod execution_plan_test;
 
 use crate::environment;
diff --git a/src/lib/functions/decode_func.rs b/src/lib/functions/decode_func.rs
index a03594be..cfabf51c 100644
--- a/src/lib/functions/decode_func.rs
+++ b/src/lib/functions/decode_func.rs
@@ -6,7 +6,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./decode_func_test.rs"]
+#[path = "decode_func_test.rs"]
 mod decode_func_test;
 
 use crate::environment;
diff --git a/src/lib/functions/getat_func.rs b/src/lib/functions/getat_func.rs
index ede7c706..3dc18a67 100644
--- a/src/lib/functions/getat_func.rs
+++ b/src/lib/functions/getat_func.rs
@@ -4,7 +4,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./getat_func_test.rs"]
+#[path = "getat_func_test.rs"]
 mod getat_func_test;
 
 use envmnt;
diff --git a/src/lib/functions/mod.rs b/src/lib/functions/mod.rs
index 87c5964f..8f23cadb 100644
--- a/src/lib/functions/mod.rs
+++ b/src/lib/functions/mod.rs
@@ -4,7 +4,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./mod_test.rs"]
+#[path = "mod_test.rs"]
 mod mod_test;
 
 mod decode_func;
diff --git a/src/lib/functions/remove_empty_func.rs b/src/lib/functions/remove_empty_func.rs
index 0dd5adea..9f1dc988 100644
--- a/src/lib/functions/remove_empty_func.rs
+++ b/src/lib/functions/remove_empty_func.rs
@@ -4,7 +4,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./remove_empty_func_test.rs"]
+#[path = "remove_empty_func_test.rs"]
 mod remove_empty_func_test;
 
 use envmnt;
diff --git a/src/lib/functions/split_func.rs b/src/lib/functions/split_func.rs
index 5c98101b..0993ea1a 100644
--- a/src/lib/functions/split_func.rs
+++ b/src/lib/functions/split_func.rs
@@ -4,7 +4,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./split_func_test.rs"]
+#[path = "split_func_test.rs"]
 mod split_func_test;
 
 use envmnt;
diff --git a/src/lib/functions/trim_func.rs b/src/lib/functions/trim_func.rs
index 8876e461..1bc4e260 100644
--- a/src/lib/functions/trim_func.rs
+++ b/src/lib/functions/trim_func.rs
@@ -5,7 +5,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./trim_func_test.rs"]
+#[path = "trim_func_test.rs"]
 mod trim_func_test;
 
 use envmnt;
diff --git a/src/lib/installer/cargo_plugin_installer.rs b/src/lib/installer/cargo_plugin_installer.rs
index 3937c66f..3f5b3a8a 100644
--- a/src/lib/installer/cargo_plugin_installer.rs
+++ b/src/lib/installer/cargo_plugin_installer.rs
@@ -4,7 +4,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./cargo_plugin_installer_test.rs"]
+#[path = "cargo_plugin_installer_test.rs"]
 mod cargo_plugin_installer_test;
 
 use crate::command;
diff --git a/src/lib/installer/crate_installer.rs b/src/lib/installer/crate_installer.rs
index 1e0e5bb1..fae7f038 100644
--- a/src/lib/installer/crate_installer.rs
+++ b/src/lib/installer/crate_installer.rs
@@ -4,7 +4,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./crate_installer_test.rs"]
+#[path = "crate_installer_test.rs"]
 mod crate_installer_test;
 
 use crate::command;
diff --git a/src/lib/installer/crate_version_check.rs b/src/lib/installer/crate_version_check.rs
index 3ff36d43..a832090a 100644
--- a/src/lib/installer/crate_version_check.rs
+++ b/src/lib/installer/crate_version_check.rs
@@ -4,7 +4,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./crate_version_check_test.rs"]
+#[path = "crate_version_check_test.rs"]
 mod crate_version_check_test;
 
 use dirs_next;
diff --git a/src/lib/installer/mod.rs b/src/lib/installer/mod.rs
index 7063d51e..eba425ff 100644
--- a/src/lib/installer/mod.rs
+++ b/src/lib/installer/mod.rs
@@ -12,7 +12,7 @@ pub(crate) mod crate_version_check;
 pub(crate) mod rustup_component_installer;
 
 #[cfg(test)]
-#[path = "./mod_test.rs"]
+#[path = "mod_test.rs"]
 mod mod_test;
 
 use crate::scriptengine;
diff --git a/src/lib/installer/rustup_component_installer.rs b/src/lib/installer/rustup_component_installer.rs
index b16edfe3..3cc2aa2b 100644
--- a/src/lib/installer/rustup_component_installer.rs
+++ b/src/lib/installer/rustup_component_installer.rs
@@ -4,7 +4,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./rustup_component_installer_test.rs"]
+#[path = "rustup_component_installer_test.rs"]
 mod rustup_component_installer_test;
 
 use crate::command;
diff --git a/src/lib/io.rs b/src/lib/io.rs
index b8529cab..a5967002 100644
--- a/src/lib/io.rs
+++ b/src/lib/io.rs
@@ -4,7 +4,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./io_test.rs"]
+#[path = "io_test.rs"]
 mod io_test;
 
 use fsio::file::modify_file;
diff --git a/src/lib/legacy.rs b/src/lib/legacy.rs
index 7abe2163..7660675a 100644
--- a/src/lib/legacy.rs
+++ b/src/lib/legacy.rs
@@ -4,7 +4,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./legacy_test.rs"]
+#[path = "legacy_test.rs"]
 mod legacy_test;
 
 use dirs_next;
diff --git a/src/lib/logger.rs b/src/lib/logger.rs
index 07ea35b3..dc64cd94 100755
--- a/src/lib/logger.rs
+++ b/src/lib/logger.rs
@@ -4,7 +4,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./logger_test.rs"]
+#[path = "logger_test.rs"]
 mod logger_test;
 
 use crate::recursion_level;
diff --git a/src/lib/profile.rs b/src/lib/profile.rs
index 5898048c..30404c39 100644
--- a/src/lib/profile.rs
+++ b/src/lib/profile.rs
@@ -4,7 +4,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./profile_test.rs"]
+#[path = "profile_test.rs"]
 mod profile_test;
 
 use envmnt;
diff --git a/src/lib/proxy_task.rs b/src/lib/proxy_task.rs
index b4ac046d..e039a9ca 100644
--- a/src/lib/proxy_task.rs
+++ b/src/lib/proxy_task.rs
@@ -3,7 +3,7 @@ use std::env;
 use crate::{logger, profile, types::Task};
 
 #[cfg(test)]
-#[path = "./proxy_task_test.rs"]
+#[path = "proxy_task_test.rs"]
 mod proxy_task_test;
 
 pub(crate) fn create_proxy_task(
diff --git a/src/lib/recursion_level.rs b/src/lib/recursion_level.rs
index 394bcd04..db1bd52c 100644
--- a/src/lib/recursion_level.rs
+++ b/src/lib/recursion_level.rs
@@ -4,7 +4,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./recursion_level_test.rs"]
+#[path = "recursion_level_test.rs"]
 mod recursion_level_test;
 
 use envmnt;
diff --git a/src/lib/runner.rs b/src/lib/runner.rs
index d5859bb2..ad372c48 100755
--- a/src/lib/runner.rs
+++ b/src/lib/runner.rs
@@ -9,7 +9,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./runner_test.rs"]
+#[path = "runner_test.rs"]
 mod runner_test;
 
 use crate::command;
diff --git a/src/lib/scriptengine/duck_script/mod.rs b/src/lib/scriptengine/duck_script/mod.rs
index 7047af89..237137d2 100644
--- a/src/lib/scriptengine/duck_script/mod.rs
+++ b/src/lib/scriptengine/duck_script/mod.rs
@@ -4,7 +4,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./mod_test.rs"]
+#[path = "mod_test.rs"]
 mod mod_test;
 
 mod sdk;
diff --git a/src/lib/scriptengine/generic_script.rs b/src/lib/scriptengine/generic_script.rs
index 6f30371d..c296e7d8 100644
--- a/src/lib/scriptengine/generic_script.rs
+++ b/src/lib/scriptengine/generic_script.rs
@@ -4,7 +4,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./generic_script_test.rs"]
+#[path = "generic_script_test.rs"]
 mod generic_script_test;
 
 use crate::command;
diff --git a/src/lib/scriptengine/mod.rs b/src/lib/scriptengine/mod.rs
index ee6c224d..c8596fec 100755
--- a/src/lib/scriptengine/mod.rs
+++ b/src/lib/scriptengine/mod.rs
@@ -12,7 +12,7 @@ mod shebang_script;
 mod shell_to_batch;
 
 #[cfg(test)]
-#[path = "./mod_test.rs"]
+#[path = "mod_test.rs"]
 mod mod_test;
 
 use crate::environment;
diff --git a/src/lib/scriptengine/os_script.rs b/src/lib/scriptengine/os_script.rs
index b69c028f..4a8c12ad 100644
--- a/src/lib/scriptengine/os_script.rs
+++ b/src/lib/scriptengine/os_script.rs
@@ -4,7 +4,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./os_script_test.rs"]
+#[path = "os_script_test.rs"]
 mod os_script_test;
 
 use crate::command;
diff --git a/src/lib/scriptengine/rsscript.rs b/src/lib/scriptengine/rsscript.rs
index aa0e2ed0..9040f50b 100755
--- a/src/lib/scriptengine/rsscript.rs
+++ b/src/lib/scriptengine/rsscript.rs
@@ -4,7 +4,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./rsscript_test.rs"]
+#[path = "rsscript_test.rs"]
 mod rsscript_test;
 
 use crate::command;
diff --git a/src/lib/scriptengine/script_utils.rs b/src/lib/scriptengine/script_utils.rs
index 46205fcf..81f8dc4f 100644
--- a/src/lib/scriptengine/script_utils.rs
+++ b/src/lib/scriptengine/script_utils.rs
@@ -4,7 +4,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./script_utils_test.rs"]
+#[path = "script_utils_test.rs"]
 mod script_utils_test;
 
 use crate::io;
diff --git a/src/lib/scriptengine/shebang_script.rs b/src/lib/scriptengine/shebang_script.rs
index 1163832b..3b77185d 100644
--- a/src/lib/scriptengine/shebang_script.rs
+++ b/src/lib/scriptengine/shebang_script.rs
@@ -4,7 +4,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./shebang_script_test.rs"]
+#[path = "shebang_script_test.rs"]
 mod shebang_script_test;
 
 use crate::scriptengine::generic_script;
diff --git a/src/lib/scriptengine/shell_to_batch.rs b/src/lib/scriptengine/shell_to_batch.rs
index 84e60dc9..f24701a8 100755
--- a/src/lib/scriptengine/shell_to_batch.rs
+++ b/src/lib/scriptengine/shell_to_batch.rs
@@ -4,7 +4,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./shell_to_batch_test.rs"]
+#[path = "shell_to_batch_test.rs"]
 mod shell_to_batch_test;
 
 use crate::command;
diff --git a/src/lib/storage.rs b/src/lib/storage.rs
index 43075896..651e5595 100644
--- a/src/lib/storage.rs
+++ b/src/lib/storage.rs
@@ -4,7 +4,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./storage_test.rs"]
+#[path = "storage_test.rs"]
 mod storage_test;
 
 use crate::legacy;
diff --git a/src/lib/toolchain.rs b/src/lib/toolchain.rs
index 816d14ca..c41cc655 100644
--- a/src/lib/toolchain.rs
+++ b/src/lib/toolchain.rs
@@ -4,7 +4,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./toolchain_test.rs"]
+#[path = "toolchain_test.rs"]
 mod toolchain_test;
 
 use crate::types::CommandSpec;
diff --git a/src/lib/types.rs b/src/lib/types.rs
index e1cd078f..64aad3b6 100755
--- a/src/lib/types.rs
+++ b/src/lib/types.rs
@@ -4,7 +4,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./types_test.rs"]
+#[path = "types_test.rs"]
 mod types_test;
 
 use crate::legacy;
diff --git a/src/lib/version.rs b/src/lib/version.rs
index dde8e075..84c999ba 100755
--- a/src/lib/version.rs
+++ b/src/lib/version.rs
@@ -5,7 +5,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./version_test.rs"]
+#[path = "version_test.rs"]
 mod version_test;
 
 use crate::cache;
diff --git a/src/main.rs b/src/main.rs
index bfe61869..dc7ae7d3 100755
--- a/src/main.rs
+++ b/src/main.rs
@@ -26,7 +26,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./main_test.rs"]
+#[path = "main_test.rs"]
 mod main_test;
 
 fn get_name() -> String {
diff --git a/src/makers.rs b/src/makers.rs
index d7f0d839..016f692b 100644
--- a/src/makers.rs
+++ b/src/makers.rs
@@ -13,7 +13,7 @@
 //!
 
 #[cfg(test)]
-#[path = "./makers_test.rs"]
+#[path = "makers_test.rs"]
 mod makers_test;
 
 fn get_name() -> String {

From 419f3c5525048c7e17fc84f70bff45fe91491fe4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Kav=C3=ADk?= <martin@kavik.cz>
Date: Mon, 29 Mar 2021 15:58:45 +0200
Subject: [PATCH 3/3] refactor: move enable_ansi_support to makers.rs

---
 src/lib/mod.rs | 8 ++++----
 src/makers.rs  | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/lib/mod.rs b/src/lib/mod.rs
index 5bff99f0..e7510f08 100755
--- a/src/lib/mod.rs
+++ b/src/lib/mod.rs
@@ -158,6 +158,10 @@
 //! [Apache 2](https://github.com/sagiegurari/cargo-make/blob/master/LICENSE) open source license.
 //!
 
+// Dependencies used in the binary `makers`:
+#[cfg(windows)]
+use ansi_term as _;
+
 #[macro_use]
 extern crate log;
 #[macro_use]
@@ -195,9 +199,5 @@ mod version;
 
 /// Handles the command line arguments and executes the runner.
 pub fn run_cli(command_name: String, sub_command: bool) {
-    #[cfg(windows)]
-    if let Err(err) = ansi_term::enable_ansi_support() {
-        eprintln!("error enabling ANSI support: {:?}", err);
-    }
     cli::run_cli(command_name, sub_command)
 }
diff --git a/src/makers.rs b/src/makers.rs
index 016f692b..abbd6117 100644
--- a/src/makers.rs
+++ b/src/makers.rs
@@ -21,6 +21,8 @@ fn get_name() -> String {
 }
 
 fn main() {
+    #[cfg(windows)]
+    let _ = ansi_term::enable_ansi_support();
     let name = get_name();
     cli::run_cli(name, false);
 }