chore: Upgrade rust toolchain to 1.70

.circleci/config.yml

@@ -98,7 +98,7 @@ commands:
     steps:
       - save_cache:
           name: "Save rustup cache"
-          key: cargo-v2-{{ checksum "rust-toolchain.toml" }}-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }}-{{ arch }}
+          key: cargo-v2-{{ checksum "rust-toolchain" }}-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }}-{{ arch }}
           paths:
             - "~/.cargo"
             - "~/.rustup"
@@ -107,7 +107,7 @@ commands:
       steps:
         - restore_cache:
             keys:
-              - cargo-v2-{{ checksum "rust-toolchain.toml" }}-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }}-{{ arch }}
+              - cargo-v2-{{ checksum "rust-toolchain" }}-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }}-{{ arch }}
 
   install_gpu_deps:
     steps:

fcomm/tests/makefile_tests.rs

@@ -20,7 +20,7 @@ fn test_make_fcomm_examples() {
     let cpus = num_cpus::get();
 
     let make_output = Command::new("make")
-        .current_dir(&examples_dir)
+        .current_dir(examples_dir)
         .arg(format!("-j{}", cpus))
         .output()
         .expect("Failed to run the make command, is make installed?");

flake.nix

@@ -20,7 +20,7 @@
         };
 
         toolchain = with fenix.packages.${system}; fromToolchainFile {
-          file = ./rust-toolchain.toml; # alternatively, dir = ./.;
+          file = ./rust-toolchain; # alternatively, dir = ./.;
           sha256 = "sha256-4vetmUhTUsew5FODnjlnQYInzyLNyDwocGa4IvMk3DM=";
         };
 

lurk-macros/tests/lurk_macro_test.rs

@@ -77,7 +77,7 @@ mod test {
             },
             iterations,
             _emitted,
-        ) = Evaluator::new(expr, empty_sym_env(&s_), s_, limit, &lang)
+        ) = Evaluator::new(expr, empty_sym_env(s_), s_, limit, &lang)
             .eval()
             .unwrap();
 
@@ -102,7 +102,7 @@ mod test {
             },
             iterations,
             _emitted,
-        ) = Evaluator::new(expr, empty_sym_env(&s_), s_, limit, &lang)
+        ) = Evaluator::new(expr, empty_sym_env(s_), s_, limit, &lang)
             .eval()
             .unwrap();
 

rust-toolchain

@@ -0,0 +1 @@
+1.70.0

src/circuit/circuit_frame.rs

@@ -1188,8 +1188,8 @@ fn reduce_sym<F: LurkField, CS: ConstraintSystem<F>>(
         &with_cons_binding_unmatched
     )?;
 
-    let output_expr_should_be_val = with_sym_binding_matched.clone();
-    let output_expr_should_be_val_to_use = with_cons_binding_matched.clone();
+    let output_expr_should_be_val = &with_sym_binding_matched;
+    let output_expr_should_be_val_to_use = &with_cons_binding_matched;
 
     // env
     let output_env_should_be_env = or!(
@@ -1226,10 +1226,10 @@ fn reduce_sym<F: LurkField, CS: ConstraintSystem<F>>(
 
     // expr
     implies!(cs, &output_expr_should_be_expr, &output_expr_is_expr);
-    implies!(cs, &output_expr_should_be_val, &output_expr_is_val);
+    implies!(cs, output_expr_should_be_val, &output_expr_is_val);
     implies!(
         cs,
-        &output_expr_should_be_val_to_use,
+        output_expr_should_be_val_to_use,
         &output_expr_is_val_to_use
     );
     implies!(cs, &output_cont_should_be_error, &output_expr_is_expr);

src/store.rs

@@ -722,7 +722,7 @@ impl<F: LurkField> Store<F> {
             )
         };
 
-        if let Some(ptr) = self.sym_store.0.get(&symbol_name) {
+        if let Some(ptr) = self.sym_store.0.get(symbol_name) {
             Ptr::index(tag, ptr.to_usize())
         } else {
             let ptr = self.sym_store.0.get(symbol_name).unwrap();
@@ -749,7 +749,7 @@ impl<F: LurkField> Store<F> {
             )
         };
 
-        if let Some(ptr) = self.sym_store.0.get(&symbol_name) {
+        if let Some(ptr) = self.sym_store.0.get(symbol_name) {
             Ptr::index(tag, ptr.to_usize())
         } else {
             // We need to intern each of the path segments individually, so they will be in the store.