Skip to content

Commit 1f0eef3

Browse files
authored
Merge pull request #26 from ProvableHQ/fmt/v1.0.0
[Format] Incorporate latest nightly changes.
2 parents 8c26c22 + bdfc0c4 commit 1f0eef3

File tree

313 files changed

+649
-649
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

313 files changed

+649
-649
lines changed

.rustfmt.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ imports_layout = "HorizontalVertical"
1313
imports_granularity = "Crate"
1414
overflow_delimited_expr = true
1515
reorder_impl_items = true
16-
version = "Two"
16+
style_edition = "2024"

algorithms/benches/crypto_hash/poseidon.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#[macro_use]
1717
extern crate criterion;
1818

19-
use snarkvm_algorithms::{crypto_hash::PoseidonSponge, AlgebraicSponge};
19+
use snarkvm_algorithms::{AlgebraicSponge, crypto_hash::PoseidonSponge};
2020
use snarkvm_curves::bls12_377::{Fq, FqParameters};
2121
use snarkvm_fields::Fp384;
2222
use snarkvm_utilities::{TestRng, Uniform};

algorithms/benches/fft/fft.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ use snarkvm_curves::bls12_377::Fr as Bls12_377_Fr;
2020
use snarkvm_fields::PrimeField;
2121
use snarkvm_utilities::TestRng;
2222

23-
use criterion::{criterion_group, criterion_main, Bencher, BenchmarkId, Criterion};
23+
use criterion::{Bencher, BenchmarkId, Criterion, criterion_group, criterion_main};
2424
use std::cmp::min;
2525

2626
/// Degree bounds to benchmark on

algorithms/benches/snark/varuna.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
extern crate criterion;
1818

1919
use snarkvm_algorithms::{
20-
crypto_hash::PoseidonSponge,
21-
snark::varuna::{ahp::AHPForR1CS, CircuitVerifyingKey, TestCircuit, VarunaHidingMode, VarunaSNARK},
2220
AlgebraicSponge,
2321
SNARK,
22+
crypto_hash::PoseidonSponge,
23+
snark::varuna::{CircuitVerifyingKey, TestCircuit, VarunaHidingMode, VarunaSNARK, ahp::AHPForR1CS},
2424
};
2525
use snarkvm_curves::bls12_377::{Bls12_377, Fq, Fr};
2626
use snarkvm_utilities::{CanonicalDeserialize, CanonicalSerialize, TestRng};

algorithms/src/crypto_hash/poseidon.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// See the License for the specific language governing permissions and
1414
// limitations under the License.
1515

16-
use crate::{nonnative_params::*, AlgebraicSponge, DuplexSpongeMode};
16+
use crate::{AlgebraicSponge, DuplexSpongeMode, nonnative_params::*};
1717
use snarkvm_fields::{FieldParameters, PoseidonParameters, PrimeField, ToConstraintField};
1818
use snarkvm_utilities::{BigInteger, FromBits, ToBits};
1919

algorithms/src/crypto_hash/tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// See the License for the specific language governing permissions and
1414
// limitations under the License.
1515

16-
use crate::{crypto_hash::PoseidonSponge, AlgebraicSponge, DuplexSpongeMode};
16+
use crate::{AlgebraicSponge, DuplexSpongeMode, crypto_hash::PoseidonSponge};
1717
use snarkvm_curves::bls12_377::Fr;
1818
use snarkvm_fields::{PoseidonDefaultField, PoseidonGrainLFSR};
1919

algorithms/src/fft/domain.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ use crate::{
3232
cfg_iter_mut,
3333
fft::{DomainCoeff, SparsePolynomial},
3434
};
35-
use snarkvm_fields::{batch_inversion, FftField, FftParameters, Field};
35+
use snarkvm_fields::{FftField, FftParameters, Field, batch_inversion};
3636
#[cfg(not(feature = "serial"))]
3737
use snarkvm_utilities::max_available_threads;
3838
use snarkvm_utilities::{execute_with_max_available_threads, serialize::*};
3939

4040
use rand::Rng;
4141
use std::{borrow::Cow, fmt};
4242

43-
use anyhow::{ensure, Result};
43+
use anyhow::{Result, ensure};
4444

4545
#[cfg(not(feature = "serial"))]
4646
use rayon::prelude::*;

algorithms/src/fft/polynomial/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
//! Work with sparse and dense polynomials.
1717
1818
use crate::fft::{EvaluationDomain, Evaluations};
19-
use snarkvm_fields::{Field, PrimeField};
20-
use snarkvm_utilities::{cfg_iter_mut, serialize::*, SerializationError};
2119
use Polynomial::*;
20+
use snarkvm_fields::{Field, PrimeField};
21+
use snarkvm_utilities::{SerializationError, cfg_iter_mut, serialize::*};
2222

23-
use anyhow::{ensure, Result};
23+
use anyhow::{Result, ensure};
2424
use std::{borrow::Cow, convert::TryInto};
2525

2626
#[cfg(not(feature = "serial"))]

algorithms/src/fft/polynomial/multiplier.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use crate::fft::domain::{FFTPrecomputation, IFFTPrecomputation};
1919

2020
/// A struct that helps multiply a batch of polynomials
2121
use super::*;
22-
use snarkvm_utilities::{cfg_into_iter, cfg_iter, cfg_iter_mut, cfg_reduce_with, ExecutionPool};
22+
use snarkvm_utilities::{ExecutionPool, cfg_into_iter, cfg_iter, cfg_iter_mut, cfg_reduce_with};
2323

2424
#[derive(Default)]
2525
pub struct PolyMultiplier<'a, F: PrimeField> {

algorithms/src/fft/tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// See the License for the specific language governing permissions and
1414
// limitations under the License.
1515

16-
use crate::fft::{domain::*, DensePolynomial};
16+
use crate::fft::{DensePolynomial, domain::*};
1717
use rand::Rng;
1818
use snarkvm_curves::bls12_377::{Fr, G1Projective};
1919
use snarkvm_fields::{FftField, Field, One, Zero};

0 commit comments

Comments
 (0)