From 66a3d02b4585a76615d750c33a37edd5e8fd30e6 Mon Sep 17 00:00:00 2001 From: datdenkikniet Date: Sun, 16 Apr 2023 11:02:49 +0200 Subject: [PATCH] Rename cargo_commands -> run Rename command -> cargo_command --- xtask/src/argument_parsing.rs | 2 +- xtask/src/{command.rs => cargo_command.rs} | 2 +- xtask/src/main.rs | 10 +++++----- xtask/src/{cargo_commands.rs => run.rs} | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) rename xtask/src/{command.rs => cargo_command.rs} (99%) rename xtask/src/{cargo_commands.rs => run.rs} (99%) diff --git a/xtask/src/argument_parsing.rs b/xtask/src/argument_parsing.rs index 738168e16a..8c8f7d2a2d 100644 --- a/xtask/src/argument_parsing.rs +++ b/xtask/src/argument_parsing.rs @@ -1,4 +1,4 @@ -use crate::{command::CargoCommand, Target, ARMV6M, ARMV7M, ARMV8MBASE, ARMV8MMAIN}; +use crate::{cargo_command::CargoCommand, Target, ARMV6M, ARMV7M, ARMV8MBASE, ARMV8MMAIN}; use clap::{Args, Parser, Subcommand}; use core::fmt; diff --git a/xtask/src/command.rs b/xtask/src/cargo_command.rs similarity index 99% rename from xtask/src/command.rs rename to xtask/src/cargo_command.rs index 33d0703031..cd38566e45 100644 --- a/xtask/src/command.rs +++ b/xtask/src/cargo_command.rs @@ -1,7 +1,7 @@ use log::{error, info, Level}; use crate::{ - argument_parsing::Globals, cargo_commands::FinalRunResult, ExtraArguments, RunResult, Target, + argument_parsing::Globals, xtasks::FinalRunResult, ExtraArguments, RunResult, Target, TestRunError, }; use core::fmt; diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 2f350795e3..09bf8c7209 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -1,11 +1,11 @@ mod argument_parsing; mod build; -mod cargo_commands; -mod command; +mod xtasks; +mod cargo_command; use argument_parsing::{ExtraArguments, Globals}; use clap::Parser; -use command::OutputMode; +use cargo_command::OutputMode; use core::fmt; use diffy::{create_patch, PatchFormatter}; use std::{ @@ -23,8 +23,8 @@ use log::{error, info, log_enabled, trace, Level}; use crate::{ argument_parsing::{Backends, BuildOrCheck, Cli, Commands}, build::init_build_dir, - cargo_commands::*, - command::{handle_results, run_command, run_successful, CargoCommand}, + xtasks::*, + cargo_command::{handle_results, run_command, run_successful, CargoCommand}, }; #[derive(Debug, Clone, Copy)] diff --git a/xtask/src/cargo_commands.rs b/xtask/src/run.rs similarity index 99% rename from xtask/src/cargo_commands.rs rename to xtask/src/run.rs index e2982e4f75..32fafc8441 100644 --- a/xtask/src/cargo_commands.rs +++ b/xtask/src/run.rs @@ -2,7 +2,7 @@ use std::path::PathBuf; use crate::{ argument_parsing::{Backends, BuildOrCheck, ExtraArguments, Globals, PackageOpt, TestMetadata}, - command::{BuildMode, CargoCommand}, + cargo_command::{BuildMode, CargoCommand}, command_parser, RunResult, }; use log::error;