aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordatdenkikniet <jcdra1@gmail.com>2023-04-15 14:43:40 +0200
committerdatdenkikniet <jcdra1@gmail.com>2023-04-15 14:43:40 +0200
commitc6f4b834c184275298fabaae7b5bd70efe54b29d (patch)
treebc1421b6a912c1b31a016c8db921c931a5310cd9
parentfeb00a9755ae8f96c8b761f288a6dad2eb41c5b1 (diff)
Fix fmt
-rw-r--r--.github/workflows/build.yml4
-rw-r--r--xtask/src/argument_parsing.rs4
-rw-r--r--xtask/src/main.rs2
3 files changed, 5 insertions, 5 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index aadb0a9..f32e506 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,8 +31,8 @@ jobs:
- name: Cache Dependencies
uses: Swatinem/rust-cache@v2
- - name: cargo xtask format-check
- run: cargo xtask --verbose format-check
+ - name: cargo xtask fmt
+ run: cargo xtask --verbose fmt -c
# Compilation check
check:
diff --git a/xtask/src/argument_parsing.rs b/xtask/src/argument_parsing.rs
index 7028017..3ee9e34 100644
--- a/xtask/src/argument_parsing.rs
+++ b/xtask/src/argument_parsing.rs
@@ -306,9 +306,9 @@ pub enum Commands {
pub struct FormatOpt {
#[clap(flatten)]
pub package: PackageOpt,
- /// Apply formatting fixes immediately.
+ /// Check-only, do not apply formatting fixes.
#[clap(short, long)]
- pub apply: bool,
+ pub check: bool,
}
#[derive(Args, Debug, Clone)]
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index eab21b3..2bfe851 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -218,7 +218,7 @@ fn main() -> anyhow::Result<()> {
};
let final_run_results = match &cli.command {
- Commands::Format(args) => cargo_format(globals, &cargologlevel, &args.package, !args.apply),
+ Commands::Format(args) => cargo_format(globals, &cargologlevel, &args.package, args.check),
Commands::Clippy(args) => {
info!("Running clippy on backend: {backend:?}");
cargo_clippy(globals, &cargologlevel, &args, backend)