From 3e5a0fa1755ea79449b4228cb45c3cd7633f5710 Mon Sep 17 00:00:00 2001
From: Carson McManus <carson.mcmanus1@gmail.com>
Date: Tue, 10 Aug 2021 22:49:19 -0400
Subject: [PATCH] combine CI workflows

---
 .github/workflows/rust.yml    | 20 ++++++++++++++++++++
 .github/workflows/rustfmt.yml | 25 -------------------------
 2 files changed, 20 insertions(+), 25 deletions(-)
 delete mode 100644 .github/workflows/rustfmt.yml

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 2d9595d..0a6a768 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -20,3 +20,23 @@ jobs:
       run: cargo build --workspace --verbose
     - name: Run tests
       run: cargo test --workspace --verbose
+  lint:
+    name: rustfmt
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout sources
+      uses: actions/checkout@v2
+
+    - name: Install stable toolchain
+      uses: actions-rs/toolchain@v1
+      with:
+        profile: minimal
+        toolchain: stable
+        override: true
+        components: rustfmt
+
+    - name: Run cargo fmt
+      uses: actions-rs/cargo@v1
+      with:
+        command: fmt
+        args: --all -- --check
diff --git a/.github/workflows/rustfmt.yml b/.github/workflows/rustfmt.yml
deleted file mode 100644
index 655d2bc..0000000
--- a/.github/workflows/rustfmt.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-on: [push, pull_request]
-
-name: rustfmt
-
-jobs:
-  rustfmt:
-    name: rustfmt
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v2
-
-      - name: Install stable toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-          components: rustfmt
-
-      - name: Run cargo fmt
-        uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check