default.nix fix, clippy

crates/compiler/gen_llvm/src/llvm/lowlevel.rs

@@ -1826,7 +1826,7 @@ fn throw_on_overflow<'ctx>(
         .unwrap()
 }
 
-fn throw_because_overflow<'ctx>(env: &Env<'_, 'ctx, '_>, message: &str) {
+fn throw_because_overflow(env: &Env<'_, '_, '_>, message: &str) {
     let block = env.builder.get_insert_block().expect("to be in a function");
     let di_location = env.builder.get_current_debug_location().unwrap();
 

crates/compiler/mono/src/tail_recursion.rs

@@ -501,9 +501,9 @@ where
     candidate_set
 }
 
-fn trmc_candidates_help<'a>(
+fn trmc_candidates_help(
     function_name: LambdaName,
-    stmt: &'_ Stmt<'a>,
+    stmt: &'_ Stmt,
     candidates: &mut TrmcCandidateSet,
 ) {
     // if this stmt is the literal tail tag application and return, then this is a TRMC opportunity

default.nix

@@ -4,16 +4,22 @@
     sha256 = (builtins.fromJSON (builtins.readFile ./flake.lock)).nodes.nixpkgs.locked.narHash;
   }
 , pkgs ? import nixpkgsSource { }
-,
 }:
 # we only use this file to release a nix package, use flake.nix for development
 let
   rustPlatform = pkgs.rustPlatform;
+  lib = pkgs.lib;
+
+  desiredRustVersion = (builtins.fromTOML (builtins.readFile (./rust-toolchain.toml))).toolchain.channel;
+  actualRustVersionStr = lib.lists.last (lib.splitString "-" rustPlatform.rust.rustc);
 
   llvmPkgs = pkgs.llvmPackages_13;
   # nix does not store libs in /usr/lib or /lib
   nixGlibcPath = if pkgs.stdenv.isLinux then "${pkgs.glibc.out}/lib" else "";
 in
+
+assert lib.assertMsg (actualRustVersionStr == desiredRustVersion) "The rust version changed, nixpkgs.url in flake.nix should be altered so that it uses a commit(=rev) of nix with a matching rust version.";
+
 rustPlatform.buildRustPackage {
   pname = "roc";
   version = "0.0.1";
@@ -51,7 +57,7 @@ rustPlatform.buildRustPackage {
     python3
     llvmPkgs.clang
     llvmPkgs.llvm.dev
-    zig
+    zig_0_9
   ]);
 
   buildInputs = (with pkgs;

flake.nix

@@ -2,7 +2,8 @@
   description = "Roc flake";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs?rev=9f4346eac544cc0db5eb7d889e71eac0f9c8b9eb";
+    nixpkgs.url = "github:nixos/nixpkgs?rev=d7887373fe0731719365831cd254c1e5948307d3";
+
 
     # rust from nixpkgs has some libc problems, this is patched in the rust-overlay
     rust-overlay = {
@@ -90,7 +91,7 @@
           llvmPkgs.clang
           libxkbcommon
           pkg-config
-          zig # roc builtins are implemented in zig, see compiler/builtins/bitcode/
+          zig_0_9 # roc builtins are implemented in zig, see compiler/builtins/bitcode/
 
           # lib deps
           libffi