Mirrors branch v1.3.3 from private at 61b1b630862aa4134233a045f9dd4e8…

…509263333 (#12)

.gitignore

@@ -1,4 +1,3 @@
 /target
 Cargo.lock
 .idea/
-

cs_derive/src/utils.rs

@@ -77,7 +77,7 @@ fn find_in_equivalent_types(ty: &TypePath) -> (TypePath, Option<GenericParam>) {
             let second_ty: TypePath = syn::parse_str(b).unwrap();
             let type_param = if let Some(ref ty_param) = c {
                 Some(GenericParam::Type(
-                    syn::parse_str::<TypeParam>(ty_param.clone()).unwrap(),
+                    syn::parse_str::<TypeParam>(ty_param).unwrap(),
                 ))
             } else {
                 None

src/glue/code_unpacker_sha256/mod.rs

@@ -250,7 +250,7 @@ use crate::glue::optimizable_queue::{
 };
 use crate::glue::traits::get_vec_vec_witness_raw_with_hint_on_more_in_subset;
 use crate::glue::traits::CircuitFixedLengthEncodableExt;
-use crate::scheduler::queues::memory_access::*;
+// use crate::scheduler::queues::memory_access::*;
 use crate::scheduler::queues::*;
 use crate::vm::optimizer::sponge_set::SpongeOptimizer;
 use crate::vm::primitives::UInt64;

src/glue/memory_queries_validity/mod.rs

@@ -5,7 +5,6 @@ use crate::glue::optimizable_queue::{
 };
 use crate::glue::traits::get_vec_witness_raw_with_hint;
 use crate::glue::traits::CircuitFixedLengthEncodableExt;
-use crate::scheduler::queues::memory_access::*;
 use crate::scheduler::queues::*;
 use crate::vm::optimizer::sponge_set::SpongeOptimizer;
 use crate::vm::primitives::UInt64;

src/glue/merkleize_l1_messages/merkleize.rs

@@ -606,8 +606,6 @@ pub(crate) fn byte_encodable_queue_binary_hash<
         chunk.copy_from_slice(&encoding);
     }
 
-    drop(encoding_area);
-
     let binary_hash = binary_hasher.hash(cs, &bytes)?;
 
     Ok(binary_hash)

src/glue/optimizable_queue/simple_impl.rs

@@ -1,5 +1,4 @@
 use super::super::traits::*;
-use super::utils::*;
 use super::*;
 use crate::bellman::SynthesisError;
 use crate::circuit_structures::traits::*;

src/recursion/recursion_tree/utils.rs

@@ -46,7 +46,6 @@ impl<
                     layer_elements.push(node_hash);
                 }
                 assert!(layer_elements.len().is_power_of_two());
-                drop(src);
                 node_layers.push(layer_elements);
             }
             assert_eq!(node_layers.last().unwrap().len(), 1);

src/scheduler/queues/mod.rs

@@ -8,7 +8,6 @@ pub mod delegated_memory_write;
 pub mod ecdsa_request;
 pub mod full_sponge_like_queue_state;
 pub mod l1_authorizations;
-pub mod memory_access;
 pub mod pubdata_chunk;
 pub mod queue_state;
 pub mod recursive_request;
@@ -24,7 +23,6 @@ pub use self::delegated_memory_write::*;
 pub use self::ecdsa_request::*;
 pub use self::full_sponge_like_queue_state::*;
 pub use self::l1_authorizations::*;
-pub use self::memory_access::*;
 pub use self::pubdata_chunk::*;
 pub use self::queue_state::*;
 pub use self::recursive_request::*;