feat: extend range of possible implementations of bytereader/bytewriter

air/src/air/assertions/mod.rs

@@ -4,12 +4,12 @@
 // LICENSE file in the root directory of this source tree.
 
 use crate::errors::AssertionError;
+use alloc::vec::Vec;
 use core::{
     cmp::Ordering,
     fmt::{Display, Formatter},
 };
 use math::FieldElement;
-use utils::collections::*;
 
 #[cfg(test)]
 mod tests;

air/src/air/assertions/tests.rs

@@ -4,9 +4,9 @@
 // LICENSE file in the root directory of this source tree.
 
 use super::{Assertion, AssertionError};
+use alloc::vec::Vec;
 use math::{fields::f128::BaseElement, FieldElement};
 use rand_utils::{rand_value, rand_vector};
-use utils::collections::*;
 
 // SINGLE ASSERTIONS
 // ================================================================================================

air/src/air/boundary/constraint.rs

@@ -4,8 +4,8 @@
 // LICENSE file in the root directory of this source tree.
 
 use super::{Assertion, ExtensionOf, FieldElement};
+use alloc::{collections::BTreeMap, vec::Vec};
 use math::{fft, polynom};
-use utils::collections::*;
 
 // BOUNDARY CONSTRAINT
 // ================================================================================================

air/src/air/boundary/constraint_group.rs

@@ -4,7 +4,7 @@
 // LICENSE file in the root directory of this source tree.
 
 use super::{Assertion, BoundaryConstraint, ConstraintDivisor, ExtensionOf, FieldElement};
-use utils::collections::*;
+use alloc::{collections::BTreeMap, vec::Vec};
 
 // BOUNDARY CONSTRAINT GROUP
 // ================================================================================================

air/src/air/boundary/mod.rs

@@ -4,8 +4,11 @@
 // LICENSE file in the root directory of this source tree.
 
 use super::{AirContext, Assertion, ConstraintDivisor};
+use alloc::{
+    collections::{BTreeMap, BTreeSet},
+    vec::Vec,
+};
 use math::{ExtensionOf, FieldElement};
-use utils::collections::*;
 
 mod constraint;
 pub use constraint::BoundaryConstraint;

air/src/air/boundary/tests.rs

@@ -7,10 +7,10 @@ use super::{
     super::tests::{build_prng, build_sequence_poly},
     Assertion, BoundaryConstraint,
 };
+use alloc::{collections::BTreeMap, vec::Vec};
 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::*;
 
 // BOUNDARY CONSTRAINT TESTS
 // ================================================================================================

air/src/air/coefficients.rs

@@ -3,8 +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 alloc::vec::Vec;
 use math::FieldElement;
-use utils::collections::*;
 
 // AUXILIARY TRACE SEGMENT RANDOMNESS
 // ================================================================================================

air/src/air/context.rs

@@ -4,9 +4,9 @@
 // LICENSE file in the root directory of this source tree.
 
 use crate::{air::TransitionConstraintDegree, ProofOptions, TraceInfo};
+use alloc::vec::Vec;
 use core::cmp;
 use math::StarkField;
-use utils::collections::*;
 
 // AIR CONTEXT
 // ================================================================================================

air/src/air/divisor.rs

@@ -4,9 +4,9 @@
 // LICENSE file in the root directory of this source tree.
 
 use crate::air::Assertion;
+use alloc::vec::Vec;
 use core::fmt::{Display, Formatter};
 use math::{FieldElement, StarkField};
-use utils::collections::*;
 
 // CONSTRAINT DIVISOR
 // ================================================================================================

air/src/air/mod.rs

@@ -4,9 +4,9 @@
 // LICENSE file in the root directory of this source tree.
 
 use crate::ProofOptions;
+use alloc::{collections::BTreeMap, vec::Vec};
 use crypto::{RandomCoin, RandomCoinError};
 use math::{fft, ExtensibleField, ExtensionOf, FieldElement, StarkField, ToElements};
-use utils::collections::*;
 
 mod trace_info;
 pub use trace_info::{TraceInfo, TraceLayout};

air/src/air/tests.rs

@@ -8,9 +8,9 @@ use super::{
     TransitionConstraintDegree,
 };
 use crate::{AuxTraceRandElements, FieldExtension};
+use alloc::{collections::BTreeMap, vec::Vec};
 use crypto::{hashers::Blake3_256, DefaultRandomCoin, RandomCoin};
 use math::{fields::f64::BaseElement, get_power_series, polynom, FieldElement, StarkField};
-use utils::collections::*;
 
 // PERIODIC COLUMNS
 // ================================================================================================

air/src/air/trace_info.rs

@@ -3,11 +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 alloc::{string::ToString, vec::Vec};
 use math::{StarkField, ToElements};
-use utils::{
-    collections::*, string::*, ByteReader, ByteWriter, Deserializable, DeserializationError,
-    Serializable,
-};
+use utils::{ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable};
 
 // CONSTANTS
 // ================================================================================================

air/src/air/transition/degree.rs

@@ -4,8 +4,8 @@
 // LICENSE file in the root directory of this source tree.
 
 use super::{super::super::ProofOptions, MIN_CYCLE_LENGTH};
+use alloc::vec::Vec;
 use core::cmp;
-use utils::collections::*;
 
 // TRANSITION CONSTRAINT DEGREE
 // ================================================================================================

air/src/air/transition/frame.rs

@@ -4,7 +4,7 @@
 // LICENSE file in the root directory of this source tree.
 
 use super::FieldElement;
-use utils::collections::*;
+use alloc::vec::Vec;
 
 // EVALUATION FRAME
 // ================================================================================================

air/src/air/transition/mod.rs

@@ -4,7 +4,7 @@
 // LICENSE file in the root directory of this source tree.
 
 use super::{AirContext, ConstraintDivisor, ExtensionOf, FieldElement};
-use utils::collections::*;
+use alloc::vec::Vec;
 
 mod frame;
 pub use frame::EvaluationFrame;

air/src/lib.rs

@@ -27,9 +27,8 @@
 //! This crate also contains components describing STARK protocol parameters ([ProofOptions]) and
 //! proof structure ([StarkProof](proof::StarkProof)).
 
-#![cfg_attr(not(feature = "std"), no_std)]
+#![no_std]
 
-#[cfg(not(feature = "std"))]
 #[macro_use]
 extern crate alloc;
 

air/src/options.rs

@@ -3,11 +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 alloc::vec::Vec;
 use fri::FriOptions;
 use math::{StarkField, ToElements};
-use utils::{
-    collections::*, ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable,
-};
+use utils::{ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable};
 
 // CONSTANTS
 // ================================================================================================

air/src/proof/commitments.rs

@@ -3,10 +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 alloc::vec::Vec;
 use crypto::Hasher;
 use utils::{
-    collections::*, ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable,
-    SliceReader,
+    ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, SliceReader,
 };
 
 // COMMITMENTS

air/src/proof/context.rs

@@ -4,11 +4,9 @@
 // LICENSE file in the root directory of this source tree.
 
 use crate::{ProofOptions, TraceInfo, TraceLayout};
+use alloc::{string::ToString, vec::Vec};
 use math::{StarkField, ToElements};
-use utils::{
-    collections::*, string::*, ByteReader, ByteWriter, Deserializable, DeserializationError,
-    Serializable,
-};
+use utils::{ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable};
 
 // PROOF CONTEXT
 // ================================================================================================

air/src/proof/mod.rs

@@ -6,13 +6,12 @@
 //! Contains STARK proof struct and associated components.
 
 use crate::{ProofOptions, TraceInfo, TraceLayout};
+use alloc::vec::Vec;
 use core::cmp;
 use crypto::Hasher;
 use fri::FriProof;
 use math::FieldElement;
-use utils::{
-    collections::*, ByteReader, Deserializable, DeserializationError, Serializable, SliceReader,
-};
+use utils::{ByteReader, Deserializable, DeserializationError, Serializable, SliceReader};
 
 mod context;
 pub use context::Context;

air/src/proof/ood_frame.rs

@@ -3,10 +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 alloc::vec::Vec;
 use math::FieldElement;
 use utils::{
-    collections::*, ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable,
-    SliceReader,
+    ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, SliceReader,
 };
 
 // TYPE ALIASES

air/src/proof/queries.rs

@@ -4,11 +4,11 @@
 // LICENSE file in the root directory of this source tree.
 
 use super::Table;
+use alloc::vec::Vec;
 use crypto::{BatchMerkleProof, ElementHasher, Hasher};
 use math::FieldElement;
 use utils::{
-    collections::*, ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable,
-    SliceReader,
+    ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, SliceReader,
 };
 
 // QUERIES

air/src/proof/table.rs

@@ -4,9 +4,9 @@
 // LICENSE file in the root directory of this source tree.
 
 use super::{DeserializationError, SliceReader};
+use alloc::vec::Vec;
 use core::iter::FusedIterator;
 use math::FieldElement;
-use utils::collections::*;
 use utils::ByteReader;
 
 // CONSTANTS

crypto/src/lib.rs

@@ -16,9 +16,8 @@
 //!   [RandomCoin] implementation uses a cryptographic hash function to generate pseudo-random
 //!   elements form a seed.
 
-#![cfg_attr(not(feature = "std"), no_std)]
+#![no_std]
 
-#[cfg(not(feature = "std"))]
 #[macro_use]
 extern crate alloc;
 

crypto/src/merkle/concurrent.rs

@@ -4,8 +4,9 @@
 // LICENSE file in the root directory of this source tree.
 
 use crate::Hasher;
+use alloc::vec::Vec;
 use core::slice;
-use utils::{collections::*, iterators::*, rayon};
+use utils::{iterators::*, rayon};
 
 // CONSTANTS
 // ================================================================================================

crypto/src/merkle/mod.rs

@@ -4,8 +4,11 @@
 // LICENSE file in the root directory of this source tree.
 
 use crate::{errors::MerkleTreeError, hash::Hasher};
+use alloc::{
+    collections::{BTreeMap, BTreeSet},
+    vec::Vec,
+};
 use core::slice;
-use utils::collections::*;
 
 mod proofs;
 pub use proofs::BatchMerkleProof;

crypto/src/merkle/proofs.rs

@@ -4,7 +4,8 @@
 // LICENSE file in the root directory of this source tree.
 
 use crate::{errors::MerkleTreeError, Hasher};
-use utils::{collections::*, string::*, ByteReader, DeserializationError, Serializable};
+use alloc::{collections::BTreeMap, string::ToString, vec::Vec};
+use utils::{ByteReader, DeserializationError, Serializable};
 
 // CONSTANTS
 // ================================================================================================

crypto/src/random/default.rs

@@ -4,8 +4,8 @@
 // LICENSE file in the root directory of this source tree.
 
 use crate::{errors::RandomCoinError, Digest, ElementHasher, RandomCoin};
+use alloc::vec::Vec;
 use math::{FieldElement, StarkField};
-use utils::collections::*;
 
 // DEFAULT RANDOM COIN IMPLEMENTATION
 // ================================================================================================

crypto/src/random/mod.rs

@@ -4,8 +4,8 @@
 // LICENSE file in the root directory of this source tree.
 
 use crate::{errors::RandomCoinError, ElementHasher, Hasher};
+use alloc::vec::Vec;
 use math::{FieldElement, StarkField};
-use utils::collections::*;
 
 mod default;
 pub use default::DefaultRandomCoin;

examples/src/rescue_raps/custom_trace_table.rs

@@ -3,7 +3,7 @@
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
 
-use core_utils::{collections::*, uninit_vector};
+use core_utils::uninit_vector;
 use winterfell::{
     math::{FieldElement, StarkField},
     matrix::ColMatrix,

fri/src/folding/mod.rs

@@ -11,11 +11,12 @@
 #[cfg(feature = "concurrent")]
 use utils::iterators::*;
 
+use alloc::vec::Vec;
 use math::{
     fft::{get_inv_twiddles, serial_fft},
     get_power_series_with_offset, polynom, FieldElement, StarkField,
 };
-use utils::{collections::*, iter_mut, uninit_vector};
+use utils::{iter_mut, uninit_vector};
 
 // DEGREE-RESPECTING PROJECTION
 // ================================================================================================

fri/src/lib.rs

@@ -61,9 +61,8 @@
 //! * [DEEP-FRI: Sampling Outside the Box Improves Soundness](https://eprint.iacr.org/2019/336)
 //! * Swastik Kooparty's [talk on DEEP-FRI](https://www.youtube.com/watch?v=txo_kPSn59Y&list=PLcIyXLwiPilWvjvNkhMn283LV370Pk5CT&index=6)
 
-#![cfg_attr(not(feature = "std"), no_std)]
+#![no_std]
 
-#[cfg(not(feature = "std"))]
 #[macro_use]
 extern crate alloc;
 

fri/src/proof.rs

@@ -3,11 +3,11 @@
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the root directory of this source tree.
 
+use alloc::{string::ToString, vec::Vec};
 use crypto::{BatchMerkleProof, ElementHasher, Hasher};
 use math::FieldElement;
 use utils::{
-    collections::*, string::*, ByteReader, ByteWriter, Deserializable, DeserializationError,
-    Serializable, SliceReader,
+    ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable, SliceReader,
 };
 
 // FRI PROOF

fri/src/prover/channel.rs

@@ -3,10 +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 alloc::vec::Vec;
 use core::marker::PhantomData;
 use crypto::{ElementHasher, Hasher, RandomCoin};
 use math::FieldElement;
-use utils::collections::*;
 
 // PROVER CHANNEL TRAIT
 // ================================================================================================