Update toolchain (#84)

* update toolchain to non-prehistoric

* fixes after toolchain bump

Author: DamianStraszak

crates/shielder-circuits/src/config_builder.rs

@@ -14,9 +14,9 @@ use crate::{
     column_pool::{AccessColumn, ColumnPool, ConfigPhase, PreSynthesisPhase},
     consts::merkle_constants::WIDTH,
     gates::{
-        is_point_on_curve::IsPointOnCurveGate, is_point_on_curve_affine::IsPointOnCurveAffineGate,
-        membership::MembershipGate, points_add::PointsAddGate, scalar_multiply::ScalarMultiplyGate,
-        sum::SumGate, to_affine::ToAffineGate, Gate,
+        is_point_on_curve_affine::IsPointOnCurveAffineGate, membership::MembershipGate,
+        points_add::PointsAddGate, scalar_multiply::ScalarMultiplyGate, sum::SumGate,
+        to_affine::ToAffineGate, Gate,
     },
     instance_wrapper::InstanceWrapper,
     merkle::{MerkleChip, MerkleInstance},
@@ -37,7 +37,6 @@ pub struct ConfigsBuilder<'cs> {
     scalar_multiply: Option<ScalarMultiplyChip>,
     to_affine: Option<ToAffineChip>,
     to_projective: Option<ToProjectiveChip>,
-    is_point_on_curve: Option<IsPointOnCurveGate>,
     is_point_on_curve_affine: Option<IsPointOnCurveAffineGate>,
     el_gamal_encryption: Option<ElGamalEncryptionChip>,
     note: Option<NoteChip>,
@@ -66,7 +65,6 @@ impl<'cs> ConfigsBuilder<'cs> {
             scalar_multiply: None,
             to_affine: None,
             to_projective: None,
-            is_point_on_curve: None,
             is_point_on_curve_affine: None,
             el_gamal_encryption: None,
             note: None,
@@ -198,20 +196,6 @@ impl<'cs> ConfigsBuilder<'cs> {
             .expect("ToProjective chip is not configured")
     }
 
-    pub fn with_is_point_on_curve(mut self) -> Self {
-        check_if_cached!(self, is_point_on_curve);
-        self.is_point_on_curve = Some(IsPointOnCurveGate::create_gate(
-            self.system,
-            &mut self.advice_pool,
-        ));
-        self
-    }
-
-    pub fn is_point_on_curve_gate(&self) -> IsPointOnCurveGate {
-        self.is_point_on_curve
-            .expect("IsPointOnCurveGate is not configured")
-    }
-
     pub fn with_is_point_on_curve_affine(mut self) -> Self {
         check_if_cached!(self, is_point_on_curve_affine);
         self.is_point_on_curve_affine = Some(IsPointOnCurveAffineGate::create_gate(

crates/shielder-circuits/src/synthesizer.rs

@@ -52,7 +52,7 @@ struct SynthesizerImpl<'a, L: Layouter<Fr>> {
     advice_pool: &'a ColumnPool<Advice, SynthesisPhase>,
 }
 
-impl<'a, L: Layouter<Fr>> Synthesizer for SynthesizerImpl<'a, L> {
+impl<L: Layouter<Fr>> Synthesizer for SynthesizerImpl<'_, L> {
     fn namespaced(&mut self, name: impl Into<String>) -> impl Synthesizer {
         SynthesizerImpl {
             layouter: self.layouter.namespace(|| name),
@@ -88,7 +88,7 @@ impl<'a, L: Layouter<Fr>> Synthesizer for SynthesizerImpl<'a, L> {
 }
 
 /// Delegate `Layouter` implementation to the inner layouter.
-impl<'a, L: Layouter<Fr>> Layouter<Fr> for SynthesizerImpl<'a, L> {
+impl<L: Layouter<Fr>> Layouter<Fr> for SynthesizerImpl<'_, L> {
     type Root = L::Root;
 
     fn assign_region<A, AR, N, NR>(&mut self, name: N, assignment: A) -> Result<AR, Error>
@@ -136,7 +136,7 @@ impl<'a, L: Layouter<Fr>> Layouter<Fr> for SynthesizerImpl<'a, L> {
 }
 
 /// Delegate `AccessColumn` implementation to the inner advice pool.
-impl<'a, L: Layouter<Fr>> AccessColumn<Advice> for SynthesizerImpl<'a, L> {
+impl<L: Layouter<Fr>> AccessColumn<Advice> for SynthesizerImpl<'_, L> {
     fn get_any_column(&self) -> Column<Advice> {
         self.advice_pool.get_any_column()
     }

rust-toolchain.toml

@@ -1,4 +1,4 @@
 [toolchain]
-channel = "nightly-2024-07-08"
-components = [ "rustfmt", "clippy", "rust-src" ]
-targets = [ "x86_64-unknown-linux-gnu" ]
+channel = "1.85.0"
+components = ["rustfmt", "clippy", "rust-src"]
+targets = ["x86_64-unknown-linux-gnu"]