Skip to content

Commit

Permalink
Format using nightly (#79)
Browse files Browse the repository at this point in the history
  • Loading branch information
kevgo committed Apr 9, 2024
1 parent 3c2624a commit 364a1b5
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ jobs:
override: true
components: rustfmt, clippy
- uses: Swatinem/rust-cache@v1.2.0
- run: make setup
- run: make test
10 changes: 7 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ cukethis: target/debug/mrt # runs only end-to-end tests with a @this tag

fix: tools/rta@${RUN_THAT_APP_VERSION} # auto-corrects issues
tools/rta dprint fmt
cargo fmt
cargo fix
cargo +nightly fmt
cargo +nightly fix --allow-dirty

help: # shows all available Make commands
cat Makefile | grep '^[^ ]*:' | grep -v '.PHONY' | grep -v '.SILENT:' | grep '#' | grep -v help | sed 's/:.*#/#/' | column -s "#" -t
Expand All @@ -23,10 +23,14 @@ install: # installs the binary in the system
lint: tools/rta@${RUN_THAT_APP_VERSION} # checks formatting
tools/rta dprint check
cargo clippy --all-targets --all-features -- --deny=warnings
cargo fmt -- --check
cargo +nightly fmt -- --check
git diff --check
tools/rta actionlint

setup: # install development dependencies on this computer
rustup toolchain add nightly
rustup component add rustfmt --toolchain nightly

test: unit lint cuke # runs all tests

unit: # runs the unit tests
Expand Down
1 change: 0 additions & 1 deletion src/commands/ignore.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use crate::config::Config;
use crate::error::UserError;
use std::mem::drop;
use std::process::ExitCode;

pub fn ignore(config: Config) -> Result<(Config, Option<ExitCode>), UserError> {
Expand Down

0 comments on commit 364a1b5

Please sign in to comment.