Merge remote-tracking branch 'upstream/main' into plafer-merge-trace-…

…info-layout
facebook · Feb 21, 2024 · 2071fc4 · 2071fc4
2 parents e7d2511 + 23eb713
commit 2071fc4
Show file tree

Hide file tree

Showing 106 changed files with 150 additions and 171 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.8.1 (2024-02-21)
+* Refactored util module re-exports to comply with latest clippy updates (#250).
+
 ## 0.8.0 (2024-02-06)
 * Added variable-length serialization and deserialization for `usize` type (#238).
 * [BREAKING] Removed `Serializable` and `Deserializable` implementations from slices and vectors (#239).

diff --git a/air/Cargo.toml b/air/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "winter-air"
-version = "0.8.0"
+version = "0.8.1"
 description = "AIR components for the Winterfell STARK prover/verifier"
 authors = ["winterfell contributors"]
 readme = "README.md"
 license = "MIT"
 repository = "https://github.com/novifinancial/winterfell"
-documentation = "https://docs.rs/winter-air/0.8.0"
+documentation = "https://docs.rs/winter-air/0.8.1"
 categories = ["cryptography", "no-std"]
 keywords = ["crypto", "arithmetization", "air"]
 edition = "2021"

diff --git a/air/src/air/assertions/mod.rs b/air/src/air/assertions/mod.rs
@@ -5,11 +5,11 @@
 
 use crate::errors::AssertionError;
 use core::{
-    cmp::{Ord, Ordering, PartialOrd},
+    cmp::Ordering,
     fmt::{Display, Formatter},
 };
 use math::FieldElement;
-use utils::collections::Vec;
+use utils::collections::*;
 
 #[cfg(test)]
 mod tests;

diff --git a/air/src/air/assertions/tests.rs b/air/src/air/assertions/tests.rs
@@ -6,7 +6,7 @@
 use super::{Assertion, AssertionError};
 use math::{fields::f128::BaseElement, FieldElement};
 use rand_utils::{rand_value, rand_vector};
-use utils::collections::Vec;
+use utils::collections::*;
 
 // SINGLE ASSERTIONS
 // ================================================================================================

diff --git a/air/src/air/boundary/constraint.rs b/air/src/air/boundary/constraint.rs
@@ -3,8 +3,9 @@
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
 
-use super::{Assertion, BTreeMap, ExtensionOf, FieldElement, Vec};
+use super::{Assertion, ExtensionOf, FieldElement};
 use math::{fft, polynom};
+use utils::collections::*;
 
 // BOUNDARY CONSTRAINT
 // ================================================================================================

diff --git a/air/src/air/boundary/constraint_group.rs b/air/src/air/boundary/constraint_group.rs
@@ -3,9 +3,8 @@
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
 
-use super::{
-    Assertion, BTreeMap, BoundaryConstraint, ConstraintDivisor, ExtensionOf, FieldElement, Vec,
-};
+use super::{Assertion, BoundaryConstraint, ConstraintDivisor, ExtensionOf, FieldElement};
+use utils::collections::*;
 
 // BOUNDARY CONSTRAINT GROUP
 // ================================================================================================

diff --git a/air/src/air/boundary/mod.rs b/air/src/air/boundary/mod.rs
@@ -5,7 +5,7 @@
 
 use super::{AirContext, Assertion, ConstraintDivisor};
 use math::{ExtensionOf, FieldElement};
-use utils::collections::{BTreeMap, BTreeSet, Vec};
+use utils::collections::*;
 
 mod constraint;
 pub use constraint::BoundaryConstraint;

diff --git a/air/src/air/boundary/tests.rs b/air/src/air/boundary/tests.rs
@@ -10,7 +10,7 @@ use super::{
 use crypto::{hashers::Blake3_256, DefaultRandomCoin, RandomCoin};
 use math::{fields::f64::BaseElement, polynom, FieldElement, StarkField};
 use rand_utils::{rand_value, rand_vector, shuffle};
-use utils::collections::{BTreeMap, Vec};
+use utils::collections::*;
 
 // BOUNDARY CONSTRAINT TESTS
 // ================================================================================================

diff --git a/air/src/air/coefficients.rs b/air/src/air/coefficients.rs
@@ -4,7 +4,7 @@
 // LICENSE file in the root directory of this source tree.
 
 use math::FieldElement;
-use utils::collections::Vec;
+use utils::collections::*;
 
 // AUXILIARY TRACE SEGMENT RANDOMNESS
 // ================================================================================================

diff --git a/air/src/air/context.rs b/air/src/air/context.rs
@@ -6,7 +6,7 @@
 use crate::{air::TransitionConstraintDegree, ProofOptions, TraceInfo};
 use core::cmp;
 use math::StarkField;
-use utils::collections::Vec;
+use utils::collections::*;
 
 // AIR CONTEXT
 // ================================================================================================

diff --git a/air/src/air/divisor.rs b/air/src/air/divisor.rs
@@ -6,7 +6,7 @@
 use crate::air::Assertion;
 use core::fmt::{Display, Formatter};
 use math::{FieldElement, StarkField};
-use utils::collections::Vec;
+use utils::collections::*;
 
 // CONSTRAINT DIVISOR
 // ================================================================================================

diff --git a/air/src/air/mod.rs b/air/src/air/mod.rs
@@ -6,7 +6,7 @@
 use crate::ProofOptions;
 use crypto::{RandomCoin, RandomCoinError};
 use math::{fft, ExtensibleField, ExtensionOf, FieldElement, StarkField, ToElements};
-use utils::collections::{BTreeMap, Vec};
+use utils::collections::*;
 
 mod trace_info;
 pub use trace_info::TraceInfo;

diff --git a/air/src/air/tests.rs b/air/src/air/tests.rs
@@ -10,7 +10,7 @@ use super::{
 use crate::{AuxTraceRandElements, FieldExtension};
 use crypto::{hashers::Blake3_256, DefaultRandomCoin, RandomCoin};
 use math::{fields::f64::BaseElement, get_power_series, polynom, FieldElement, StarkField};
-use utils::collections::{BTreeMap, Vec};
+use utils::collections::*;
 
 // PERIODIC COLUMNS
 // ================================================================================================

diff --git a/air/src/air/trace_info.rs b/air/src/air/trace_info.rs
@@ -5,8 +5,8 @@
 
 use math::{StarkField, ToElements};
 use utils::{
-    collections::Vec, string::ToString, ByteReader, ByteWriter, Deserializable,
-    DeserializationError, Serializable,
+    collections::*, string::*, ByteReader, ByteWriter, Deserializable, DeserializationError,
+    Serializable,
 };
 
 // CONSTANTS

diff --git a/air/src/air/transition/degree.rs b/air/src/air/transition/degree.rs
@@ -3,8 +3,9 @@
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
 
-use super::{super::super::ProofOptions, Vec, MIN_CYCLE_LENGTH};
+use super::{super::super::ProofOptions, MIN_CYCLE_LENGTH};
 use core::cmp;
+use utils::collections::*;
 
 // TRANSITION CONSTRAINT DEGREE
 // ================================================================================================

diff --git a/air/src/air/transition/frame.rs b/air/src/air/transition/frame.rs
@@ -3,7 +3,8 @@
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
 
-use super::{FieldElement, Vec};
+use super::FieldElement;
+use utils::collections::*;
 
 // EVALUATION FRAME
 // ================================================================================================

diff --git a/air/src/air/transition/mod.rs b/air/src/air/transition/mod.rs
@@ -3,7 +3,8 @@
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
 
-use super::{AirContext, ConstraintDivisor, ExtensionOf, FieldElement, Vec};
+use super::{AirContext, ConstraintDivisor, ExtensionOf, FieldElement};
+use utils::collections::*;
 
 mod frame;
 pub use frame::EvaluationFrame;

diff --git a/air/src/options.rs b/air/src/options.rs
@@ -6,7 +6,7 @@
 use fri::FriOptions;
 use math::{StarkField, ToElements};
 use utils::{
-    collections::Vec, ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable,
+    collections::*, ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable,
 };
 
 // CONSTANTS

diff --git a/air/src/proof/commitments.rs b/air/src/proof/commitments.rs
@@ -5,7 +5,7 @@
 
 use crypto::Hasher;
 use utils::{
-    collections::Vec, ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable,
+    collections::*, ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable,
     SliceReader,
 };
 

diff --git a/air/src/proof/context.rs b/air/src/proof/context.rs
@@ -6,8 +6,8 @@
 use crate::{ProofOptions, TraceInfo};
 use math::{StarkField, ToElements};
 use utils::{
-    collections::Vec, string::ToString, ByteReader, ByteWriter, Deserializable,
-    DeserializationError, Serializable,
+    collections::*, string::*, ByteReader, ByteWriter, Deserializable, DeserializationError,
+    Serializable,
 };
 
 // PROOF CONTEXT

diff --git a/air/src/proof/mod.rs b/air/src/proof/mod.rs
@@ -11,7 +11,7 @@ use crypto::Hasher;
 use fri::FriProof;
 use math::FieldElement;
 use utils::{
-    collections::Vec, ByteReader, Deserializable, DeserializationError, Serializable, SliceReader,
+    collections::*, ByteReader, Deserializable, DeserializationError, Serializable, SliceReader,
 };
 
 mod context;

diff --git a/air/src/proof/ood_frame.rs b/air/src/proof/ood_frame.rs
@@ -5,7 +5,7 @@
 
 use math::FieldElement;
 use utils::{
-    collections::Vec, ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable,
+    collections::*, ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable,
     SliceReader,
 };
 

diff --git a/air/src/proof/queries.rs b/air/src/proof/queries.rs
@@ -7,7 +7,7 @@ use super::Table;
 use crypto::{BatchMerkleProof, ElementHasher, Hasher};
 use math::FieldElement;
 use utils::{
-    collections::Vec, ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable,
+    collections::*, ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable,
     SliceReader,
 };
 

diff --git a/air/src/proof/table.rs b/air/src/proof/table.rs
@@ -3,9 +3,10 @@
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
 
-use super::{DeserializationError, SliceReader, Vec};
+use super::{DeserializationError, SliceReader};
 use core::iter::FusedIterator;
 use math::FieldElement;
+use utils::collections::*;
 use utils::ByteReader;
 
 // CONSTANTS

diff --git a/crypto/Cargo.toml b/crypto/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "winter-crypto"
-version = "0.8.0"
+version = "0.8.1"
 description = "Cryptographic library for the Winterfell STARK prover/verifier"
 authors = ["winterfell contributors"]
 readme = "README.md"
 license = "MIT"
 repository = "https://github.com/novifinancial/winterfell"
-documentation = "https://docs.rs/winter-crypto/0.8.0"
+documentation = "https://docs.rs/winter-crypto/0.8.1"
 categories = ["cryptography", "no-std"]
 keywords = ["crypto", "merkle-tree", "hash"]
 edition = "2021"

diff --git a/crypto/src/hash/blake/mod.rs b/crypto/src/hash/blake/mod.rs
@@ -4,7 +4,7 @@
 // LICENSE file in the root directory of this source tree.
 
 use super::{ByteDigest, ElementHasher, Hasher};
-use core::{convert::TryInto, fmt::Debug, marker::PhantomData};
+use core::{fmt::Debug, marker::PhantomData};
 use math::{FieldElement, StarkField};
 use utils::ByteWriter;
 

diff --git a/crypto/src/hash/griffin/griffin64_256_jive/mod.rs b/crypto/src/hash/griffin/griffin64_256_jive/mod.rs
@@ -5,7 +5,6 @@
 
 use super::super::mds::mds_f64_8x8::mds_multiply;
 use super::{Digest, ElementHasher, Hasher};
-use core::convert::TryInto;
 use core::ops::Range;
 use math::{fields::f64::BaseElement, FieldElement, StarkField};
 

diff --git a/crypto/src/hash/griffin/griffin64_256_jive/tests.rs b/crypto/src/hash/griffin/griffin64_256_jive/tests.rs
@@ -7,7 +7,6 @@ use super::{
     BaseElement, ElementDigest, ElementHasher, FieldElement, GriffinJive64_256, Hasher, StarkField,
     INV_MDS, MDS, STATE_WIDTH,
 };
-use core::convert::TryInto;
 use proptest::prelude::*;
 
 use rand_utils::{rand_array, rand_value};

diff --git a/crypto/src/hash/rescue/rp62_248/mod.rs b/crypto/src/hash/rescue/rp62_248/mod.rs
@@ -4,7 +4,6 @@
 // LICENSE file in the root directory of this source tree.
 
 use super::{exp_acc, Digest, ElementHasher, Hasher};
-use core::convert::TryInto;
 use math::{fields::f62::BaseElement, FieldElement, StarkField};
 
 mod digest;

diff --git a/crypto/src/hash/rescue/rp62_248/tests.rs b/crypto/src/hash/rescue/rp62_248/tests.rs
@@ -7,7 +7,6 @@ use super::{
     BaseElement, ElementDigest, ElementHasher, FieldElement, Hasher, Rp62_248, ALPHA, INV_ALPHA,
     STATE_WIDTH,
 };
-use core::convert::TryInto;
 use math::StarkField;
 use rand_utils::{rand_array, rand_value};
 

diff --git a/crypto/src/hash/rescue/rp64_256/mod.rs b/crypto/src/hash/rescue/rp64_256/mod.rs
@@ -5,7 +5,6 @@
 
 use super::super::mds::mds_f64_12x12::mds_multiply;
 use super::{exp_acc, Digest, ElementHasher, Hasher};
-use core::convert::TryInto;
 use core::ops::Range;
 use math::{fields::f64::BaseElement, FieldElement, StarkField};
 

diff --git a/crypto/src/hash/rescue/rp64_256/tests.rs b/crypto/src/hash/rescue/rp64_256/tests.rs
@@ -7,7 +7,6 @@ use super::{
     BaseElement, ElementDigest, ElementHasher, FieldElement, Hasher, Rp64_256, StarkField, ALPHA,
     INV_ALPHA, INV_MDS, MDS, STATE_WIDTH,
 };
-use core::convert::TryInto;
 use proptest::prelude::*;
 
 use rand_utils::{rand_array, rand_value};

diff --git a/crypto/src/hash/rescue/rp64_256_jive/mod.rs b/crypto/src/hash/rescue/rp64_256_jive/mod.rs
@@ -5,7 +5,6 @@
 
 use super::super::mds::mds_f64_8x8::mds_multiply;
 use super::{exp_acc, Digest, ElementHasher, Hasher};
-use core::convert::TryInto;
 use core::ops::Range;
 use math::{fields::f64::BaseElement, FieldElement, StarkField};
 

diff --git a/crypto/src/hash/rescue/rp64_256_jive/tests.rs b/crypto/src/hash/rescue/rp64_256_jive/tests.rs
@@ -7,7 +7,6 @@ use super::{
     BaseElement, ElementDigest, ElementHasher, FieldElement, Hasher, RpJive64_256, StarkField,
     ALPHA, INV_ALPHA, INV_MDS, MDS, STATE_WIDTH,
 };
-use core::convert::TryInto;
 use proptest::prelude::*;
 
 use rand_utils::{rand_array, rand_value};

diff --git a/crypto/src/merkle/concurrent.rs b/crypto/src/merkle/concurrent.rs
@@ -5,7 +5,7 @@
 
 use crate::Hasher;
 use core::slice;
-use utils::{collections::Vec, iterators::*, rayon};
+use utils::{collections::*, iterators::*, rayon};
 
 // CONSTANTS
 // ================================================================================================

diff --git a/crypto/src/merkle/mod.rs b/crypto/src/merkle/mod.rs
@@ -5,7 +5,7 @@
 
 use crate::{errors::MerkleTreeError, hash::Hasher};
 use core::slice;
-use utils::collections::{BTreeMap, BTreeSet, Vec};
+use utils::collections::*;
 
 mod proofs;
 pub use proofs::BatchMerkleProof;

diff --git a/crypto/src/merkle/proofs.rs b/crypto/src/merkle/proofs.rs
@@ -4,11 +4,7 @@
 // LICENSE file in the root directory of this source tree.
 
 use crate::{errors::MerkleTreeError, Hasher};
-use utils::{
-    collections::{BTreeMap, Vec},
-    string::ToString,
-    ByteReader, DeserializationError, Serializable,
-};
+use utils::{collections::*, string::*, ByteReader, DeserializationError, Serializable};
 
 // CONSTANTS
 // ================================================================================================

diff --git a/crypto/src/random/default.rs b/crypto/src/random/default.rs
@@ -4,9 +4,8 @@
 // LICENSE file in the root directory of this source tree.
 
 use crate::{errors::RandomCoinError, Digest, ElementHasher, RandomCoin};
-use core::convert::TryInto;
 use math::{FieldElement, StarkField};
-use utils::collections::Vec;
+use utils::collections::*;
 
 // DEFAULT RANDOM COIN IMPLEMENTATION
 // ================================================================================================

diff --git a/crypto/src/random/mod.rs b/crypto/src/random/mod.rs
@@ -5,7 +5,7 @@
 
 use crate::{errors::RandomCoinError, ElementHasher, Hasher};
 use math::{FieldElement, StarkField};
-use utils::collections::Vec;
+use utils::collections::*;
 
 mod default;
 pub use default::DefaultRandomCoin;

diff --git a/examples/Cargo.toml b/examples/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "examples"
-version = "0.8.0"
+version = "0.8.1"
 description = "Examples of using Winterfell STARK prover/verifier"
 authors = ["winterfell contributors"]
 readme = "README.md"

diff --git a/examples/src/lamport/signature.rs b/examples/src/lamport/signature.rs
@@ -5,7 +5,7 @@
 
 use super::rescue::Rescue128;
 use rand_utils::prng_vector;
-use std::{cmp::Ordering, convert::TryInto};
+use std::cmp::Ordering;
 use winterfell::{
     math::{fields::f128::BaseElement, FieldElement, StarkField},
     Serializable,