From 2f8150a707dee2b95d31aa93518b09703bf7520e Mon Sep 17 00:00:00 2001
From: ltvvlz <59975641+ltvvlz@users.noreply.github.com>
Date: Tue, 2 Mar 2021 17:11:20 -0500
Subject: [PATCH 1/3] code corrections for updated Rust toolchain

---
 pairing/marlin/src/compiled.rs | 4 ++--
 pairing/marlin/src/index.rs    | 2 +-
 pairing/marlin/src/prover.rs   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pairing/marlin/src/compiled.rs b/pairing/marlin/src/compiled.rs
index e2fb6a17f8..48fbe7f913 100644
--- a/pairing/marlin/src/compiled.rs
+++ b/pairing/marlin/src/compiled.rs
@@ -75,7 +75,7 @@ impl<E: PairingEngine> Compiled<E>
         algebra::fields::batch_inversion::<E::Fr>(&mut val_eval_k);
         for (c, val) in constraints.iter().zip(val_eval_k.iter_mut())
         {
-            *val = *c.0 * val;
+            *val = *c.0 * *val;
         }
 
         let k_group = GeneralEvaluationDomain::Radix2(k_group);
@@ -129,7 +129,7 @@ impl<E: PairingEngine> Compiled<E>
         (
             |((row, col), rc)|
             {
-                oracle2 * &oracle1 - &(oracle1 * &row) - &(oracle2 * &col) + &rc
+                oracle2 * oracle1 - oracle1 * row - oracle2 * col + rc
             }
         ).collect()
     }
diff --git a/pairing/marlin/src/index.rs b/pairing/marlin/src/index.rs
index 0cb9efd4c5..54242d3f58 100644
--- a/pairing/marlin/src/index.rs
+++ b/pairing/marlin/src/index.rs
@@ -273,7 +273,7 @@ impl<'a, E: PairingEngine> Index<'a, E>
         {
             for val in self.compiled[i].constraints.iter()
             {
-                gates[(val.1).0].wire[i] += &(witness[(val.1).1] * &val.0)
+                gates[(val.1).0].wire[i] += &(witness[(val.1).1] * val.0)
             }
         }
         for gate in gates.iter()
diff --git a/pairing/marlin/src/prover.rs b/pairing/marlin/src/prover.rs
index dfcbe589cb..7b71a5e162 100644
--- a/pairing/marlin/src/prover.rs
+++ b/pairing/marlin/src/prover.rs
@@ -451,7 +451,7 @@ impl<E: PairingEngine> ProverProof<E>
                             {
                                 vanish * &index.compiled[i].val_eval_k[j] *
                                 // scale with eta's
-                                &[oracles.eta_a, oracles.eta_b, oracles.eta_c][i] * &elm
+                                &[oracles.eta_a, oracles.eta_b, oracles.eta_c][i] * elm
                             }
                         ).collect()
                     },

From 010ee521e9a616770aefc5be097b99e1fd39b5f1 Mon Sep 17 00:00:00 2001
From: mrmr1993 <mr_1993@hotmail.co.uk>
Date: Thu, 17 Jun 2021 22:42:10 +0100
Subject: [PATCH 2/3] Bump rust toolchain to 1.52.1

---
 rust-toolchain.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 63ad9ba1d9..73fce59f75 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.45.2"
+channel = "1.52.1"

From e269ac4a3b8c0b72aa6eb4bda2dbc6f3d3e2dc09 Mon Sep 17 00:00:00 2001
From: mrmr1993 <mr_1993@hotmail.co.uk>
Date: Thu, 17 Jun 2021 22:53:43 +0100
Subject: [PATCH 3/3] Upgrade zexe for fix to short_weierstrass_jacobian

---
 zexe | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zexe b/zexe
index 81be143adb..e93017fb2d 160000
--- a/zexe
+++ b/zexe
@@ -1 +1 @@
-Subproject commit 81be143adb99a3ed193f3db4508b927a7ba6c6b4
+Subproject commit e93017fb2de8373ec9424e51670b6d5db46a7295