From 246f429b6f8358c8a491536b427e7355bb3db9ed Mon Sep 17 00:00:00 2001
From: Perry Kundert <perry@hardconsulting.com>
Date: Thu, 10 Dec 2020 11:26:34 -0800
Subject: [PATCH] Use the specified rust version

---
 .circleci/config.yml | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f6ee87e..ae657e6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,29 +5,26 @@ jobs:
       ignore:
         - gh-pages
     docker:
+      # The compiletest-rs tests assume a specific Rust version's error outputs
       - image: rust:1.47
     steps:
       - checkout
-      - run:
-          name: Switch to stable rust
-          command: rustup default stable
-
       - run:
           name: Install tooling
           command: |
-            rustup component add clippy
+            cargo install clippy
 
       - run:
           name: Version information
           command: |
             rustc --version
             cargo --version
-            rustup --version
             cargo clippy --version
 
-      - run:
-          name: Calculate dependencies
-          command: cargo generate-lockfile
+      # We ship the Cargo.lock, to support Nix derivations
+      # - run:
+      #     name: Calculate dependencies
+      #     command: cargo generate-lockfile
 
       - restore_cache:
           keys: