From 430666a948dda1f56df0283999db280f5e8fba63 Mon Sep 17 00:00:00 2001
From: Jared Ramirez <jaredramirez@hey.com>
Date: Sat, 7 Nov 2020 15:29:53 -0600
Subject: [PATCH] Fix cargo clippy

---
 compiler/builtins/build.rs         | 1 +
 compiler/gen/src/llvm/build_str.rs | 4 ++--
 shell.nix                          | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/compiler/builtins/build.rs b/compiler/builtins/build.rs
index 2eaa8aec54..bb652012f4 100644
--- a/compiler/builtins/build.rs
+++ b/compiler/builtins/build.rs
@@ -45,6 +45,7 @@ fn main() {
 
     run_command("llvm-as-10", &[dest_ll, "-o", dest_bc]);
 
+    // TODO: Recursivly search zig src dir to watch for each file
     println!("cargo:rerun-if-changed=build.rs");
     println!("cargo:rerun-if-changed={}", src_path_str);
     println!("cargo:rustc-env=BUILTINS_BC={}", dest_bc);
diff --git a/compiler/gen/src/llvm/build_str.rs b/compiler/gen/src/llvm/build_str.rs
index de606628e3..6b659f3e8a 100644
--- a/compiler/gen/src/llvm/build_str.rs
+++ b/compiler/gen/src/llvm/build_str.rs
@@ -616,8 +616,8 @@ pub fn str_count_graphemes<'a, 'ctx, 'env>(
                 LowLevel::StrCountGraphemes,
                 env,
                 &[
-                    BasicValueEnum::PointerValue(str_ptr).into(),
-                    BasicValueEnum::IntValue(str_len).into(),
+                    BasicValueEnum::PointerValue(str_ptr),
+                    BasicValueEnum::IntValue(str_len),
                 ],
                 &bitcode::STR_COUNT_GRAPEHEME_CLUSTERS,
             )
diff --git a/shell.nix b/shell.nix
index f277b9f989..0dfc655160 100644
--- a/shell.nix
+++ b/shell.nix
@@ -36,6 +36,8 @@ let
       # build libraries
       pkgs.rustc
       pkgs.cargo
+      pkgs.clippy
+      pkgs.rustfmt
       pkgs.cmake
       pkgs.git
       pkgs.python3