0ct0pu5/meli-terminal-mail-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CI: Add error msg when cargo-derivefmt check fails

Browse source 
If cargo-derivefmt fails, no relevant message shows up on CI, only
something like this:

  cargo-derivefmt-melib
  cargo derivefmt --manifest-path ./melib/Cargo.toml
  git checkout meli/src/conf/overrides.rs
  Updated 1 path from the index
  git add --update ./melib/ && git diff --quiet && git diff --cached --quiet
  make: *** [.gitea/Makefile.lint:33: cargo-derivefmt-melib] Error 1

Now it shows a helpful error message with a diff:

  cargo-derivefmt-melib
  Checking that derives are sorted alphabetically...
  cargo derivefmt --manifest-path ./melib/Cargo.toml
  Some derives in the ./melib crate are not sorted alphabetically, see diff:
  diff --git a/melib/src/contacts/notmuchcontact.rs b/melib/src/contacts/notmuchcontact.rs
  index 4ee18f1a..bfcbf54a 100644
  --- a/melib/src/contacts/notmuchcontact.rs
  +++ b/melib/src/contacts/notmuchcontact.rs
  @@ -22,7 +22,7 @@

   use crate::{contacts::Card, error::Result};

  -#[derive(Clone, Debug, Eq, PartialEq, Deserialize, Serialize)]
  +#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
   pub struct NotMuchContact {
       pub name: String,
       pub address: String,

Signed-off-by: Manos Pitsidianakis <manos@pitsidianak.is>
This commit is contained in:
Manos Pitsidianakis 2024-12-05 09:02:08 +02:00
parent 07812d2c85
commit f944ebed81
No known key found for this signature in database
GPG key ID: 7729C7707F7E09D0
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
.gitea/Makefile.lint
View file

@ -11,35 +11,43 @@ RUSTFLAGS ?= -D warnings -W unreachable-pub -W rust-2021-compatibility -C debugi
RUSTUP_MAX_RETRIES ?= 10
RUST_BACKTRACE ?= short
NIGHTLY_EXISTS=`((cargo +nightly 2> /dev/null 1> /dev/null) && echo 0)|| echo 1)`
GIT=env GIT_CONFIG_GLOBAL="" GIT_CONFIG_SYSTEM="" GIT_CONFIG_NOSYSTEM=1 git
.PHONY: all
all: rustfmt clippy cargo-derivefmt-melib cargo-derivefmt-meli cargo-derivefmt-tools
@printf "All completed.\n"
@printf "All checks completed.\n"
.PHONY: rustfmt
rustfmt:
@printf "rustfmt\n"
@((if [ "${NIGHTLY_EXISTS}" -eq 0 ]; then printf "running rustfmt with nightly toolchain\n"; else printf "running rustfmt with active toolchain\n"; fi))
@((if [ "${NIGHTLY_EXISTS}" -eq 0 ]; then cargo +nightly fmt --check --all; else cargo fmt --check --all; fi))
.PHONY: clippy
clippy:
@printf "clippy\n"
cargo clippy --no-deps --all-features --all --tests --examples --benches --bins
.PHONY: cargo-derivefmt-melib
cargo-derivefmt-melib:
@printf "cargo-derivefmt-melib\n"
@printf "Checking that derives are sorted alphabetically...\n"
cargo derivefmt --manifest-path ./melib/Cargo.toml
git checkout meli/src/conf/overrides.rs
git add --update ./melib/ && git diff --quiet && git diff --cached --quiet
@$(GIT) checkout --quiet meli/src/conf/overrides.rs
@($(GIT) diff --quiet ./melib && $(GIT) diff --cached --quiet ./melib && printf "All ./melib derives are sorted alphabetically.\n") || (printf "Some derives in the ./melib crate are not sorted alphabetically, see diff:\n"; $(GIT) diff HEAD)
.PHONY: cargo-derivefmt-meli
cargo-derivefmt-meli:
@printf "cargo-derivefmt-meli\n"
@printf "Checking that derives are sorted alphabetically...\n"
cargo derivefmt --manifest-path ./meli/Cargo.toml
git checkout meli/src/conf/overrides.rs
git add --update ./meli/ && git diff --quiet && git diff --cached --quiet
@$(GIT) checkout --quiet meli/src/conf/overrides.rs
@($(GIT) diff --quiet ./meli && $(GIT) diff --cached --quiet ./meli && printf "All ./meli derives are sorted alphabetically.\n") || (printf "Some derives in the ./meli crate are not sorted alphabetically, see diff:\n"; $(GIT) diff HEAD)
.PHONY: cargo-derivefmt-tools
cargo-derivefmt-tools:
@printf "cargo-derivefmt-tools\n"
@printf "Checking that derives are sorted alphabetically...\n"
cargo derivefmt --manifest-path ./tools/Cargo.toml
git checkout meli/src/conf/overrides.rs
git add --update ./tools/ && git diff --quiet && git diff --cached --quiet
@$(GIT) checkout --quiet meli/src/conf/overrides.rs
@($(GIT) diff --quiet ./tools && $(GIT) diff --cached --quiet ./tools && printf "All ./tools derives are sorted alphabetically.\n") || (printf "Some derives in the ./tools crate are not sorted alphabetically, see diff:\n"; $(GIT) diff HEAD)