edition = 2021 (#370)

* edition = 2021

Doesn't affect anything for us as far as I've noticed.

* imports

Cargo.toml

@@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"
 repository = "https://github.com/mir-protocol/plonky2"
 keywords = ["cryptography", "SNARK", "FRI"]
 categories = ["cryptography"]
-edition = "2018"
+edition = "2021"
 default-run = "bench_recursion"
 
 [dependencies]

src/field/extension_field/mod.rs

@@ -1,5 +1,3 @@
-use std::convert::TryInto;
-
 use crate::field::field_types::{Field, PrimeField};
 
 pub mod algebra;

src/field/extension_field/target.rs

@@ -1,4 +1,3 @@
-use std::convert::{TryFrom, TryInto};
 use std::ops::Range;
 
 use crate::field::extension_field::algebra::ExtensionAlgebra;

src/field/field_types.rs

@@ -1,4 +1,3 @@
-use std::convert::TryInto;
 use std::fmt::{Debug, Display};
 use std::hash::Hash;
 use std::iter::{Product, Sum};

src/field/secp256k1.rs

@@ -1,4 +1,3 @@
-use std::convert::TryInto;
 use std::fmt;
 use std::fmt::{Debug, Display, Formatter};
 use std::hash::{Hash, Hasher};

src/gadgets/arithmetic_extension.rs

@@ -1,5 +1,3 @@
-use std::convert::TryInto;
-
 use crate::field::extension_field::target::{ExtensionAlgebraTarget, ExtensionTarget};
 use crate::field::extension_field::FieldExtension;
 use crate::field::extension_field::{Extendable, OEF};
@@ -531,8 +529,6 @@ pub(crate) struct ExtensionArithmeticOperation<F: PrimeField + Extendable<D>, co
 
 #[cfg(test)]
 mod tests {
-    use std::convert::TryInto;
-
     use anyhow::Result;
 
     use crate::field::extension_field::algebra::ExtensionAlgebra;

src/gadgets/hash.rs

@@ -1,5 +1,3 @@
-use std::convert::TryInto;
-
 use crate::field::extension_field::Extendable;
 use crate::field::field_types::RichField;
 use crate::gates::gmimc::GMiMCGate;

src/gates/gmimc.rs

@@ -328,8 +328,6 @@ impl<F: RichField + Extendable<D> + GMiMC<WIDTH>, const D: usize, const WIDTH: u
 
 #[cfg(test)]
 mod tests {
-    use std::convert::TryInto;
-
     use anyhow::Result;
 
     use crate::field::field_types::Field;

src/gates/insertion.rs

@@ -1,4 +1,3 @@
-use std::convert::TryInto;
 use std::marker::PhantomData;
 use std::ops::Range;
 

src/gates/interpolation.rs

@@ -1,4 +1,3 @@
-use std::convert::TryInto;
 use std::marker::PhantomData;
 use std::ops::Range;
 

src/gates/poseidon.rs

@@ -1,4 +1,3 @@
-use std::convert::TryInto;
 use std::marker::PhantomData;
 
 use crate::field::extension_field::target::ExtensionTarget;
@@ -538,8 +537,6 @@ where
 
 #[cfg(test)]
 mod tests {
-    use std::convert::TryInto;
-
     use anyhow::Result;
 
     use crate::field::field_types::Field;

src/gates/poseidon_mds.rs

@@ -1,4 +1,3 @@
-use std::convert::TryInto;
 use std::marker::PhantomData;
 use std::ops::Range;
 

src/hash/arch/aarch64/poseidon_goldilocks_neon.rs

@@ -1,5 +1,4 @@
 use std::arch::aarch64::*;
-use std::convert::TryInto;
 
 use static_assertions::const_assert;
 use unroll::unroll_for_loops;

src/hash/arch/x86_64/poseidon_goldilocks_avx2_bmi2.rs

@@ -1,5 +1,4 @@
 use core::arch::x86_64::*;
-use std::convert::TryInto;
 use std::mem::size_of;
 
 use static_assertions::const_assert;

src/hash/hash_types.rs

@@ -1,5 +1,3 @@
-use std::convert::TryInto;
-
 use rand::Rng;
 use serde::{Deserialize, Serialize};
 

src/hash/hashing.rs

@@ -1,7 +1,5 @@
 //! Concrete instantiation of a hash function.
 
-use std::convert::TryInto;
-
 use crate::field::extension_field::Extendable;
 use crate::field::field_types::RichField;
 use crate::hash::hash_types::{HashOut, HashOutTarget};

src/hash/merkle_proofs.rs

@@ -1,5 +1,3 @@
-use std::convert::TryInto;
-
 use anyhow::{ensure, Result};
 use serde::{Deserialize, Serialize};
 

src/hash/poseidon.rs

@@ -1,8 +1,6 @@
 //! Implementation of the Poseidon hash function, as described in
 //! https://eprint.iacr.org/2019/458.pdf
 
-use std::convert::TryInto;
-
 use unroll::unroll_for_loops;
 
 use crate::field::extension_field::target::ExtensionTarget;

src/iop/challenger.rs

@@ -1,5 +1,3 @@
-use std::convert::TryInto;
-
 use crate::field::extension_field::target::ExtensionTarget;
 use crate::field::extension_field::{Extendable, FieldExtension};
 use crate::field::field_types::RichField;

src/iop/witness.rs

@@ -1,5 +1,4 @@
 use std::collections::HashMap;
-use std::convert::TryInto;
 
 use num::{BigUint, FromPrimitive, Zero};
 

src/plonk/circuit_builder.rs

@@ -1,6 +1,5 @@
 use std::cmp::max;
 use std::collections::{BTreeMap, HashMap, HashSet};
-use std::convert::TryInto;
 use std::time::Instant;
 
 use log::{debug, info, Level};

src/plonk/vars.rs

@@ -1,4 +1,3 @@
-use std::convert::TryInto;
 use std::ops::Range;
 
 use crate::field::extension_field::algebra::ExtensionAlgebra;

src/util/serialization.rs

@@ -1,8 +1,6 @@
 use std::collections::HashMap;
-use std::convert::TryInto;
 use std::io::Cursor;
 use std::io::{Read, Result, Write};
-use std::iter::FromIterator;
 
 use crate::field::extension_field::{Extendable, FieldExtension};
 use crate::field::field_types::{PrimeField, RichField};