From e11295409cb9faf22e5ffe8acce858e70dae20ec Mon Sep 17 00:00:00 2001
From: Perry Kundert <perry@hardconsulting.com>
Date: Wed, 9 Dec 2020 06:47:25 -0800
Subject: [PATCH 1/6] Update to syn, proc-macro2 and quote "1.0"; Version 1.0.0

---
 sm/Cargo.toml       |  8 ++++----
 sm_macro/Cargo.toml | 10 +++++-----
 sm_macro/src/lib.rs |  2 --
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/sm/Cargo.toml b/sm/Cargo.toml
index bc1ddb7..8a8ef75 100644
--- a/sm/Cargo.toml
+++ b/sm/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sm"
-version = "0.9.0"
+version = "1.0.0"
 authors = ["Jean Mertz <helloworld@rustic.games>"]
 license = "MIT OR Apache-2.0"
 description = "💋 SM – a static State Machine library"
@@ -12,13 +12,13 @@ exclude = ["examples"]
 edition = "2018"
 
 [dependencies]
-sm_macro = { version = "0.9", path = "../sm_macro", optional = true }
+sm_macro = { version = "1.0", path = "../sm_macro", optional = true }
 
 [dev-dependencies]
 compiletest_rs = { version = "0.3", features = [ "stable" ] }
-criterion = "0.2"
+criterion = "0.3"
 rand = "0.5"
-sm_macro = { version = "0.9", path = "../sm_macro" }
+sm_macro = { version = "1.0", path = "../sm_macro" }
 
 [features]
 macro = ["sm_macro"]
diff --git a/sm_macro/Cargo.toml b/sm_macro/Cargo.toml
index 2814eca..37e0284 100644
--- a/sm_macro/Cargo.toml
+++ b/sm_macro/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sm_macro"
-version = "0.9.0"
+version = "1.0.0"
 authors = ["Jean Mertz <helloworld@rustic.games>"]
 license = "MIT OR Apache-2.0"
 description = "💋 SM – a static State Machine macro"
@@ -11,12 +11,12 @@ readme = "crates-io.md"
 edition = "2018"
 
 [dependencies]
-proc-macro2 = "0.4"
-quote = "0.6"
-syn = "0.15"
+proc-macro2 = "1.0"
+quote = "1.0"
+syn = "1.0"
 
 [dev-dependencies]
-sm = { version = "0.9", path = "../sm" }
+sm = { version = "1.0", path = "../sm" }
 
 [lib]
 proc-macro = true
diff --git a/sm_macro/src/lib.rs b/sm_macro/src/lib.rs
index d582ee8..321c4ec 100644
--- a/sm_macro/src/lib.rs
+++ b/sm_macro/src/lib.rs
@@ -31,8 +31,6 @@
 )]
 #![deny(clippy::all)]
 
-extern crate proc_macro;
-
 use crate::sm::machine::Machines;
 use proc_macro::TokenStream;
 use quote::quote;

From 904d0aa272daf6921422aa3c501467db511155c5 Mon Sep 17 00:00:00 2001
From: Perry Kundert <perry@hardconsulting.com>
Date: Wed, 9 Dec 2020 12:53:23 -0800
Subject: [PATCH 2/6] Update rand, correct some compiletest_rs changes due to
 Rust version

---
 examples/game-loop/main.rs                                    | 2 +-
 sm/Cargo.toml                                                 | 4 ++--
 sm/tests/compile-fail/undefined-event.rs                      | 2 +-
 sm/tests/compile-fail/undefined-transition.rs                 | 2 +-
 test_suite/Cargo.toml                                         | 2 +-
 test_suite/tests/compile-fail/macros/sm/invalid-transition.rs | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/examples/game-loop/main.rs b/examples/game-loop/main.rs
index 45776d1..45463f0 100644
--- a/examples/game-loop/main.rs
+++ b/examples/game-loop/main.rs
@@ -108,7 +108,7 @@ struct TestTunables {
 
     // A random number generator, used to generate numbers between the above
     // min/max configurations.
-    rng: rand::ThreadRng,
+    rng: rand::rngs::ThreadRng,
 }
 
 fn main() {
diff --git a/sm/Cargo.toml b/sm/Cargo.toml
index 8a8ef75..cc5a305 100644
--- a/sm/Cargo.toml
+++ b/sm/Cargo.toml
@@ -15,9 +15,9 @@ edition = "2018"
 sm_macro = { version = "1.0", path = "../sm_macro", optional = true }
 
 [dev-dependencies]
-compiletest_rs = { version = "0.3", features = [ "stable" ] }
+compiletest_rs = { version = "*" }
 criterion = "0.3"
-rand = "0.5"
+rand = "0.7"
 sm_macro = { version = "1.0", path = "../sm_macro" }
 
 [features]
diff --git a/sm/tests/compile-fail/undefined-event.rs b/sm/tests/compile-fail/undefined-event.rs
index c0633d7..98fcfb0 100644
--- a/sm/tests/compile-fail/undefined-event.rs
+++ b/sm/tests/compile-fail/undefined-event.rs
@@ -15,5 +15,5 @@ fn main() {
 
     sm.transition(Invalid);
     //~^ ERROR cannot find value `Invalid` in this scope
-    //~| ERROR no method named `transition` found for type `Lock::Machine<Lock::Locked, sm::NoneEvent>` in the current scope
+    //~| ERROR no method named `transition` found for struct `Lock::Machine<Lock::Locked, sm::NoneEvent>` in the current scope
 }
diff --git a/sm/tests/compile-fail/undefined-transition.rs b/sm/tests/compile-fail/undefined-transition.rs
index 1d3e2e5..c1de31c 100644
--- a/sm/tests/compile-fail/undefined-transition.rs
+++ b/sm/tests/compile-fail/undefined-transition.rs
@@ -16,5 +16,5 @@ fn main() {
     let sm = Machine::new(Unlocked);
 
     sm.transition(TurnKey);
-    //~^ ERROR no method named `transition` found for type `Lock::Machine<Lock::Unlocked, sm::NoneEvent>` in the current scope
+    //~^ ERROR no method named `transition` found for struct `Lock::Machine<Lock::Unlocked, sm::NoneEvent>` in the current scope
 }
diff --git a/test_suite/Cargo.toml b/test_suite/Cargo.toml
index 37c385f..82af785 100644
--- a/test_suite/Cargo.toml
+++ b/test_suite/Cargo.toml
@@ -10,4 +10,4 @@ sm = { path = "../sm" }
 sm_macro = { path = "../sm_macro" }
 
 [dependencies]
-compiletest_rs = { version = "0.3", features = [ "stable" ] }
+compiletest_rs = { version = "*" }
diff --git a/test_suite/tests/compile-fail/macros/sm/invalid-transition.rs b/test_suite/tests/compile-fail/macros/sm/invalid-transition.rs
index 8df08e3..1216981 100644
--- a/test_suite/tests/compile-fail/macros/sm/invalid-transition.rs
+++ b/test_suite/tests/compile-fail/macros/sm/invalid-transition.rs
@@ -14,5 +14,5 @@ fn main() {
 
     let sm = Machine::new(Unlocked);
     sm = sm.transition(TurnKey);
-    //~^ ERROR no method named `transition` found for type `Lock::Machine<Lock::Unlocked, sm::NoneEvent>` in the current scope
+    //~^ ERROR no method named `transition` found for struct `Lock::Machine<Lock::Unlocked, sm::NoneEvent>` in the current scope
 }

From 58c7af1f1f49c0f8faa25aeda62b7bb43c72491f Mon Sep 17 00:00:00 2001
From: Perry Kundert <perry@hardconsulting.com>
Date: Wed, 9 Dec 2020 15:17:55 -0800
Subject: [PATCH 3/6] Correct compiletest build issues

---
 sm/tests/tests.rs                                             | 2 +-
 .../tests/compile-fail/macros/sm/private-machine-state.rs     | 2 +-
 test_suite/tests/compiletest.rs                               | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sm/tests/tests.rs b/sm/tests/tests.rs
index 6bbb326..0892709 100644
--- a/sm/tests/tests.rs
+++ b/sm/tests/tests.rs
@@ -15,6 +15,6 @@ fn run_mode(mode: &str) {
 
 #[test]
 fn compile_test() {
-    run_mode("compile-fail");
     run_mode("run-pass");
+    run_mode("compile-fail");
 }
diff --git a/test_suite/tests/compile-fail/macros/sm/private-machine-state.rs b/test_suite/tests/compile-fail/macros/sm/private-machine-state.rs
index e331f20..d90f5d2 100644
--- a/test_suite/tests/compile-fail/macros/sm/private-machine-state.rs
+++ b/test_suite/tests/compile-fail/macros/sm/private-machine-state.rs
@@ -13,5 +13,5 @@ fn main() {
     use Lock::*;
 
     let _sm = Machine(Locked);
-    //~^ ERROR expected function, found struct `Machine`
+    //~^ ERROR expected function, tuple struct or tuple variant, found struct `Machine`
 }
diff --git a/test_suite/tests/compiletest.rs b/test_suite/tests/compiletest.rs
index 519a146..d2b5da4 100644
--- a/test_suite/tests/compiletest.rs
+++ b/test_suite/tests/compiletest.rs
@@ -6,7 +6,7 @@ fn run_mode(mode: &'static str) {
     let mut config = compiletest::Config::default();
 
     config.mode = mode.parse().expect("invalid mode");
-    config.target_rustcflags = Some("-L deps/target/debug/deps".to_owned());
+    config.target_rustcflags = Some("-L ../target/debug -L deps/target/debug/deps".to_owned());
     if let Ok(name) = env::var("TESTNAME") {
         config.filter = Some(name);
     }
@@ -18,6 +18,6 @@ fn run_mode(mode: &'static str) {
 
 #[test]
 fn compile_fail() {
-    run_mode("compile-fail");
     run_mode("run-pass");
+    run_mode("compile-fail");
 }

From be5b86d8b962cb1eab3f0797e6234603a7ee14ef Mon Sep 17 00:00:00 2001
From: Perry Kundert <perry@hardconsulting.com>
Date: Thu, 10 Dec 2020 09:38:02 -0800
Subject: [PATCH 4/6] Correct tests for Rust 1.47, begin adding Nix derivation

---
 .circleci/config.yml            |   2 +-
 .gitignore                      |   1 -
 Cargo.lock                      | 917 ++++++++++++++++++++++++++++++++
 README.md                       |   7 +
 default.nix                     |  22 +
 shell.nix                       |   1 +
 sm/tests/tests.rs               |   3 +-
 test_suite/deps/Cargo.toml      |   1 +
 test_suite/tests/compiletest.rs |   3 +-
 9 files changed, 953 insertions(+), 4 deletions(-)
 create mode 100644 Cargo.lock
 create mode 100644 default.nix
 create mode 120000 shell.nix

diff --git a/.circleci/config.yml b/.circleci/config.yml
index cc0d688..f6ee87e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,7 +5,7 @@ jobs:
       ignore:
         - gh-pages
     docker:
-      - image: rust:1
+      - image: rust:1.47
     steps:
       - checkout
       - run:
diff --git a/.gitignore b/.gitignore
index 4308d82..324c57f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
 target/
 **/*.rs.bk
-Cargo.lock
diff --git a/Cargo.lock b/Cargo.lock
new file mode 100644
index 0000000..47b19b7
--- /dev/null
+++ b/Cargo.lock
@@ -0,0 +1,917 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "aho-corasick"
+version = "0.7.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c0df63cb2955042487fad3aefd2c6e3ae7389ac5dc1beb28921de0b69f779d4"
+
+[[package]]
+name = "arrayref"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
+
+[[package]]
+name = "arrayvec"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
+
+[[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+
+[[package]]
+name = "base64"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
+
+[[package]]
+name = "bitflags"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+
+[[package]]
+name = "blake2b_simd"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587"
+dependencies = [
+ "arrayref",
+ "arrayvec",
+ "constant_time_eq",
+]
+
+[[package]]
+name = "bstr"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "473fc6b38233f9af7baa94fb5852dca389e3d95b8e21c8e3719301462c5d9faf"
+dependencies = [
+ "lazy_static",
+ "memchr",
+ "regex-automata",
+ "serde",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820"
+
+[[package]]
+name = "byteorder"
+version = "1.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
+
+[[package]]
+name = "cast"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b9434b9a5aa1450faa3f9cb14ea0e8c53bb5d2b3c1bfd1ab4fc03e9f33fbfb0"
+dependencies = [
+ "rustc_version",
+]
+
+[[package]]
+name = "cfg-if"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "clap"
+version = "2.33.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
+dependencies = [
+ "bitflags",
+ "textwrap",
+ "unicode-width",
+]
+
+[[package]]
+name = "compiletest_rs"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f737835bfbbe29ed1ff82d5137520338d7ed5bf1a1d4b9c1c7c58bb45b8fa29"
+dependencies = [
+ "diff",
+ "filetime",
+ "getopts",
+ "libc",
+ "log",
+ "miow",
+ "regex",
+ "rustfix",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "tester",
+ "winapi",
+]
+
+[[package]]
+name = "const_fn"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd51eab21ab4fd6a3bf889e2d0958c0a6e3a61ad04260325e919e652a2a62826"
+
+[[package]]
+name = "constant_time_eq"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
+
+[[package]]
+name = "criterion"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70daa7ceec6cf143990669a04c7df13391d55fb27bd4079d252fca774ba244d8"
+dependencies = [
+ "atty",
+ "cast",
+ "clap",
+ "criterion-plot",
+ "csv",
+ "itertools",
+ "lazy_static",
+ "num-traits",
+ "oorandom",
+ "plotters",
+ "rayon",
+ "regex",
+ "serde",
+ "serde_cbor",
+ "serde_derive",
+ "serde_json",
+ "tinytemplate",
+ "walkdir",
+]
+
+[[package]]
+name = "criterion-plot"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e022feadec601fba1649cfa83586381a4ad31c6bf3a9ab7d408118b05dd9889d"
+dependencies = [
+ "cast",
+ "itertools",
+]
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775"
+dependencies = [
+ "cfg-if 1.0.0",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
+dependencies = [
+ "cfg-if 1.0.0",
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d"
+dependencies = [
+ "cfg-if 1.0.0",
+ "const_fn",
+ "crossbeam-utils",
+ "lazy_static",
+ "memoffset",
+ "scopeguard",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d"
+dependencies = [
+ "autocfg",
+ "cfg-if 1.0.0",
+ "lazy_static",
+]
+
+[[package]]
+name = "csv"
+version = "1.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9d58633299b24b515ac72a3f869f8b91306a3cec616a602843a383acd6f9e97"
+dependencies = [
+ "bstr",
+ "csv-core",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "csv-core"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "diff"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499"
+
+[[package]]
+name = "dirs"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3"
+dependencies = [
+ "cfg-if 0.1.10",
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a"
+dependencies = [
+ "libc",
+ "redox_users",
+ "winapi",
+]
+
+[[package]]
+name = "either"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
+
+[[package]]
+name = "filetime"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c122a393ea57648015bf06fbd3d372378992e86b9ff5a7a497b076a28c79efe"
+dependencies = [
+ "cfg-if 1.0.0",
+ "libc",
+ "redox_syscall",
+ "winapi",
+]
+
+[[package]]
+name = "getopts"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
+dependencies = [
+ "unicode-width",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.1.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
+dependencies = [
+ "cfg-if 0.1.10",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "half"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d36fab90f82edc3c747f9d438e06cf0a491055896f2a279638bb5beed6c40177"
+
+[[package]]
+name = "hermit-abi"
+version = "0.1.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "itertools"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
+
+[[package]]
+name = "js-sys"
+version = "0.3.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf3d7383929f7c9c7c2d0fa596f325832df98c3704f2c60553080f7127a58175"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "libc"
+version = "0.2.81"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb"
+
+[[package]]
+name = "log"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
+dependencies = [
+ "cfg-if 0.1.10",
+]
+
+[[package]]
+name = "memchr"
+version = "2.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
+
+[[package]]
+name = "memoffset"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "miow"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897"
+dependencies = [
+ "socket2",
+ "winapi",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
+[[package]]
+name = "oorandom"
+version = "11.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
+
+[[package]]
+name = "plotters"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d1685fbe7beba33de0330629da9d955ac75bd54f33d7b79f9a895590124f6bb"
+dependencies = [
+ "js-sys",
+ "num-traits",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
+dependencies = [
+ "unicode-xid",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
+dependencies = [
+ "getrandom",
+ "libc",
+ "rand_chacha",
+ "rand_core",
+ "rand_hc",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "rand_hc"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
+dependencies = [
+ "rand_core",
+]
+
+[[package]]
+name = "rayon"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674"
+dependencies = [
+ "autocfg",
+ "crossbeam-deque",
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
+dependencies = [
+ "crossbeam-channel",
+ "crossbeam-deque",
+ "crossbeam-utils",
+ "lazy_static",
+ "num_cpus",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.1.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
+
+[[package]]
+name = "redox_users"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d"
+dependencies = [
+ "getrandom",
+ "redox_syscall",
+ "rust-argon2",
+]
+
+[[package]]
+name = "regex"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+ "thread_local",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae1ded71d66a4a97f5e961fd0cb25a5f366a42a41570d16a763a69c092c26ae4"
+dependencies = [
+ "byteorder",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189"
+
+[[package]]
+name = "rust-argon2"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb"
+dependencies = [
+ "base64",
+ "blake2b_simd",
+ "constant_time_eq",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "rustc_version"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "rustfix"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2c50b74badcddeb8f7652fa8323ce440b95286f8e4b64ebfd871c609672704e"
+dependencies = [
+ "anyhow",
+ "log",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+
+[[package]]
+name = "semver"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
+dependencies = [
+ "semver-parser",
+]
+
+[[package]]
+name = "semver-parser"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
+
+[[package]]
+name = "serde"
+version = "1.0.118"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_cbor"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e18acfa2f90e8b735b2836ab8d538de304cbb6729a7360729ea5a895d15a622"
+dependencies = [
+ "half",
+ "serde",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.118"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1500e84d27fe482ed1dc791a56eddc2f230046a040fa908c08bda1d9fb615779"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "sm"
+version = "1.0.0"
+dependencies = [
+ "compiletest_rs",
+ "criterion",
+ "rand",
+ "sm_macro",
+]
+
+[[package]]
+name = "sm_macro"
+version = "1.0.0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "sm",
+ "syn",
+]
+
+[[package]]
+name = "sm_test_suite"
+version = "0.0.0"
+dependencies = [
+ "compiletest_rs",
+ "sm",
+ "sm_macro",
+]
+
+[[package]]
+name = "socket2"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c29947abdee2a218277abeca306f25789c938e500ea5a9d4b12a5a504466902"
+dependencies = [
+ "cfg-if 1.0.0",
+ "libc",
+ "redox_syscall",
+ "winapi",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.54"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2af957a63d6bd42255c359c93d9bfdb97076bd3b820897ce55ffbfbf107f44"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-xid",
+]
+
+[[package]]
+name = "term"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0863a3345e70f61d613eab32ee046ccd1bcc5f9105fe402c61fcd0c13eeb8b5"
+dependencies = [
+ "dirs",
+ "winapi",
+]
+
+[[package]]
+name = "tester"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee72ec31009a42b53de9a6b7d8f462b493ab3b1e4767bda1fcdbb52127f13b6c"
+dependencies = [
+ "getopts",
+ "libc",
+ "term",
+]
+
+[[package]]
+name = "textwrap"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+dependencies = [
+ "unicode-width",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "tinytemplate"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d3dc76004a03cec1c5932bca4cdc2e39aaa798e3f82363dd94f9adf6098c12f"
+dependencies = [
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "unicode-width"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
+
+[[package]]
+name = "walkdir"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
+dependencies = [
+ "same-file",
+ "winapi",
+ "winapi-util",
+]
+
+[[package]]
+name = "wasi"
+version = "0.9.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3cd364751395ca0f68cafb17666eee36b63077fb5ecd972bbcd74c90c4bf736e"
+dependencies = [
+ "cfg-if 1.0.0",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1114f89ab1f4106e5b55e688b828c0ab0ea593a1ea7c094b141b14cbaaec2d62"
+dependencies = [
+ "bumpalo",
+ "lazy_static",
+ "log",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a6ac8995ead1f084a8dea1e65f194d0973800c7f571f6edd70adf06ecf77084"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5a48c72f299d80557c7c62e37e7225369ecc0c963964059509fbafe917c7549"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158"
+
+[[package]]
+name = "web-sys"
+version = "0.3.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "222b1ef9334f92a21d3fb53dc3fd80f30836959a90f9274a626d7e06315ba3c3"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/README.md b/README.md
index 9c0f5e5..fdd9086 100644
--- a/README.md
+++ b/README.md
@@ -314,6 +314,13 @@ runtime overhead.
 
 **Go forth and transition!**
 
+## Building
+
+You can install Nix, and use `nix-build` to obtain a build environment and build the project according to the
+shipped `Cargo.lock` file.
+
+Otherwise, install Cargo/Rust and use `cargo build` as usual.
+
 ## License
 
 Licensed under either of
diff --git a/default.nix b/default.nix
new file mode 100644
index 0000000..d9cf815
--- /dev/null
+++ b/default.nix
@@ -0,0 +1,22 @@
+{ pkgs ? import <nixpkgs> {}
+, lib ? pkgs.lib
+, rustPlatform ? pkgs.rustPlatform
+, openssl ? pkgs.openssl
+, pkgconfig ? pkgs.pkgconfig
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "sm";
+  version = "1.0.0";
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [];
+
+  src = lib.cleanSource ./.;
+  cargoSha256 = "14wpjibb68s9vpr7gf64fn4y35yjk6hr64zrvbbqf8d3jc5xvssd";
+
+  meta = with lib; {
+    homepage = "https://github.com/rustic-games/sm";
+    description = "Rust State Machine Library";
+    license = licenses.mit;
+  };
+}
diff --git a/shell.nix b/shell.nix
new file mode 120000
index 0000000..73537e4
--- /dev/null
+++ b/shell.nix
@@ -0,0 +1 @@
+default.nix
\ No newline at end of file
diff --git a/sm/tests/tests.rs b/sm/tests/tests.rs
index 0892709..2442e70 100644
--- a/sm/tests/tests.rs
+++ b/sm/tests/tests.rs
@@ -7,7 +7,8 @@ fn run_mode(mode: &str) {
 
     config.mode = mode.parse().expect("Invalid mode");
     config.src_base = PathBuf::from(format!("tests/{}", mode));
-    config.target_rustcflags = Some("-L ../target/debug -L ../target/debug/deps".to_string());
+    //config.target_rustcflags = Some("-L ../target/debug -L ../target/debug/deps".to_string());
+    config.link_deps();
     config.clean_rmeta();
 
     compiletest::run_tests(&config);
diff --git a/test_suite/deps/Cargo.toml b/test_suite/deps/Cargo.toml
index 7be733c..bdebf91 100644
--- a/test_suite/deps/Cargo.toml
+++ b/test_suite/deps/Cargo.toml
@@ -8,3 +8,4 @@ publish = false
 
 [dependencies]
 sm = { path = "../../sm" }
+sm_macro = { path = "../../sm_macro" }
diff --git a/test_suite/tests/compiletest.rs b/test_suite/tests/compiletest.rs
index d2b5da4..87e8a9f 100644
--- a/test_suite/tests/compiletest.rs
+++ b/test_suite/tests/compiletest.rs
@@ -6,11 +6,12 @@ fn run_mode(mode: &'static str) {
     let mut config = compiletest::Config::default();
 
     config.mode = mode.parse().expect("invalid mode");
-    config.target_rustcflags = Some("-L ../target/debug -L deps/target/debug/deps".to_owned());
+    //config.target_rustcflags = Some("-L ../target/debug -L deps/target/debug/deps".to_owned());
     if let Ok(name) = env::var("TESTNAME") {
         config.filter = Some(name);
     }
     config.src_base = format!("tests/{}", mode).into();
+    config.link_deps();
     config.clean_rmeta();
 
     compiletest::run_tests(&config);

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

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f6ee87e..6de5b32 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,13 +5,10 @@ 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: |
@@ -20,14 +17,13 @@ jobs:
       - 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:

From c7f1d079d83d91d4329f6e51b31f75e03a291ede Mon Sep 17 00:00:00 2001
From: Perry Kundert <perry@hardconsulting.com>
Date: Thu, 10 Dec 2020 13:00:16 -0800
Subject: [PATCH 6/6] Attempt to use standard Circle-CI tooling for Rust
 versioning

---
 .circleci/config.yml | 50 +++++++++++++++++++++++++++++---------------
 1 file changed, 33 insertions(+), 17 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6de5b32..d308cab 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,4 +1,15 @@
 version: 2
+
+parameters:
+  toolchain:
+    description: >-
+      Rust toolchain to use. Overrides the default toolchain (stable) or any
+      toolchain specified in the project via `rust-toolchain`.
+    type: string
+    default: '1.47'
+
+executor: default
+
 jobs:
   build:
     branches:
@@ -9,10 +20,8 @@ jobs:
       - image: rust:1.47
     steps:
       - checkout
-      - run:
-          name: Install tooling
-          command: |
-            rustup component add clippy
+      - update_toolchain:
+          toolchain: <<parameters.toolchain>>
 
       - run:
           name: Version information
@@ -20,17 +29,19 @@ jobs:
             cargo --version
             cargo clippy --version
 
-      # We ship the Cargo.lock, to support Nix derivations
-      # - run:
-      #     name: Calculate dependencies
-      #     command: cargo generate-lockfile
+      - clippy
 
-      - restore_cache:
-          keys:
-            - v1-cargo-cache-{{ arch }}-{{ checksum "Cargo.lock" }}
-            - v1-bench-{{ .Branch }}-{{ .Revision }}
-            - v1-bench-{{ .Branch }}
-            - v1-bench-
+      - run:
+          # We ship the Cargo.lock, to support Nix derivations
+          name: Calculate dependencies
+          command: test -e Cargo.lock || cargo generate-lockfile
+
+      # - restore_cache:
+      #     keys:
+      #       - v1-cargo-cache-{{ arch }}-{{ checksum "Cargo.lock" }}
+      #       - v1-bench-{{ .Branch }}-{{ .Revision }}
+      #       - v1-bench-{{ .Branch }}
+      #       - v1-bench-
 
       # DISABLED:
       # running 11 tests
@@ -74,9 +85,14 @@ jobs:
       #     name: Measure code coverage
       #     command: cargo kcov
 
-      - run:
-          name: Run lints
-          command: cargo clippy
+      # - run:
+      #     name: Run lints
+      #     command: |
+      #       if rustup component add clippy; then
+      #           cargo clippy 
+      #       else
+      #           echo Skipping clippy
+      #       fi
 
       - run:
           name: Run unit tests