Rename Fix command extension example to avoid conflict

Author: syl20bnr

crates/tracel-xtask/src/commands/test.rs

@@ -42,7 +42,11 @@ fn push_optional_args(cmd_args: &mut Vec<String>, args: &TestCmdArgs) {
         cmd_args.extend(vec!["--jobs".to_string(), jobs.to_string()]);
     };
     if let Some(threads) = &args.threads {
-        cmd_args.extend(vec!["--".to_string(), "--test-threads".to_string(), threads.to_string()]);
+        cmd_args.extend(vec![
+            "--".to_string(),
+            "--test-threads".to_string(),
+            threads.to_string(),
+        ]);
     };
 }
 
@@ -58,7 +62,10 @@ pub fn run_unit(target: &Target, args: &TestCmdArgs) -> Result<()> {
                 "--examples",
                 "--color",
                 "always",
-            ].into_iter().map(|s| s.to_string()).collect::<Vec<String>>();
+            ]
+            .into_iter()
+            .map(|s| s.to_string())
+            .collect::<Vec<String>>();
             push_optional_args(&mut cmd_args, args);
             run_process_for_workspace(
                 "cargo",
@@ -103,7 +110,10 @@ fn run_unit_test(member: &WorkspaceMember, args: &TestCmdArgs) -> Result<(), any
         "--color=always",
         "--",
         "--color=always",
-    ].into_iter().map(|s| s.to_string()).collect::<Vec<String>>();
+    ]
+    .into_iter()
+    .map(|s| s.to_string())
+    .collect::<Vec<String>>();
     push_optional_args(&mut cmd_args, args);
     run_process_for_package(
         "cargo",
@@ -133,7 +143,10 @@ pub fn run_integration(target: &Target, args: &TestCmdArgs) -> anyhow::Result<()
                 "test_*",
                 "--color",
                 "always",
-            ].into_iter().map(|s| s.to_string()).collect::<Vec<String>>();
+            ]
+            .into_iter()
+            .map(|s| s.to_string())
+            .collect::<Vec<String>>();
             push_optional_args(&mut cmd_args, args);
             run_process_for_workspace(
                 "cargo",
@@ -176,7 +189,10 @@ fn run_integration_test(member: &WorkspaceMember, args: &TestCmdArgs) -> Result<
         &member.name,
         "--color",
         "always",
-    ].into_iter().map(|s| s.to_string()).collect::<Vec<String>>();
+    ]
+    .into_iter()
+    .map(|s| s.to_string())
+    .collect::<Vec<String>>();
     push_optional_args(&mut cmd_args, args);
     run_process_for_package(
         "cargo",

xtask/src/main.rs

@@ -13,6 +13,7 @@ extern crate log;
     Coverage,
     Doc,
     Dependencies,
+    Fix,
     Publish,
     Test,
     Validate,
@@ -30,7 +31,7 @@ pub enum Command {
     /// Example of a new command which extendeds target
     ExtendedTarget(commands::extended_target::ExtendedTargetCmdArgs),
     /// Comprehensive example of an extended Fix command with an additional target and subcommand
-    Fix(commands::fix::ExtendedFixCmdArgs),
+    ExtendedFix(commands::fix::ExtendedFixCmdArgs),
     /// Example of a new command with support of base Target
     MyCommand(commands::my_command::MyCommandCmdArgs),
     /// Example of a new command with subcommands
@@ -49,8 +50,8 @@ fn main() -> anyhow::Result<()> {
         Command::ExtendedCheckSubCommands(args) => {
             commands::extended_check_sub_commands::handle_command(args)
         }
+        Command::ExtendedFix(args) => commands::fix::handle_command(args, None),
         Command::ExtendedTarget(args) => commands::extended_target::handle_command(args),
-        Command::Fix(args) => commands::fix::handle_command(args, None),
         Command::MyCommand(args) => commands::my_command::handle_command(args),
         Command::MyCommandWithSubCommand(args) => {
             commands::my_command_with_sub_commands::handle_command(args)

xtask/tests/test_examples.rs

@@ -25,8 +25,8 @@ use rstest::rstest;
 #[case::extend_base_command_with_sub_commands_by_adding_variants_lint(&["extended-check-sub-commands", "lint"], "Executing lint")]
 #[case::extend_base_command_with_sub_commands_by_adding_variants_typos(&["extended-check-sub-commands", "typos"], "Executing typos")]
 #[case::extend_base_command_with_sub_commands_by_adding_variants_new_variant(&["extended-check-sub-commands", "my-sub-command"], "Executing new subcommand")]
-#[case::extend_base_command_advanced_example(&["fix", "--target", "ci", "new-sub-command"], "Executing new subcommand on CI.")]
-#[case::extend_base_command_advanced_example_default_target(&["fix", "new-sub-command"], "Executing new subcommand on workspace.")]
+#[case::extend_base_command_advanced_example(&["extended-fix", "--target", "ci", "new-sub-command"], "Executing new subcommand on CI.")]
+#[case::extend_base_command_advanced_example_default_target(&["extended-fix", "new-sub-command"], "Executing new subcommand on workspace.")]
 fn test_xtask_example_status_success_and_returns_expected_output(
     #[case] cargo_args: &[&str],
     #[case] expected_output: String,