From 0bf8c3afdeefd1238290e388c944ec9754a29e56 Mon Sep 17 00:00:00 2001
From: dignifiedquire <me@dignifiedquire.com>
Date: Tue, 12 Nov 2019 18:31:36 +0100
Subject: [PATCH] combine clippy and fmt

---
 .github/workflows/rust.yml | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index e3fc76ec3..d1c371dcb 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -44,7 +44,7 @@ jobs:
         command: test
         args: --all --release -- --ignored
 
-  check_fmt:
+  check_fmt_clippy:
     name: Checking fmt and docs
     runs-on: ubuntu-latest
     steps:
@@ -55,25 +55,11 @@ jobs:
           profile: minimal
           toolchain: nightly
           override: true
-          components: rustfmt
+          components: rustfmt clipopy
 
     - name: fmt
       run: cargo fmt --all -- --check
 
-  clippy_check:
-    name: Clippy check
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v1
-
-    - uses: actions-rs/toolchain@v1
-      with:
-          profile: minimal
-          toolchain: nightly
-          override: true
-          components: clippy
-
     - name: clippy
       run: cargo clippy --all