Skip to content

Commit 858c4ca

Browse files
pinkforestpinkforest
authored
Address new nightly clippy unnecessary qualifications (#639)
1 parent 31ccb67 commit 858c4ca

File tree

15 files changed

+52
-57
lines changed

15 files changed

+52
-57
lines changed

‎curve25519-dalek/src/backend/mod.rs‎

Lines changed: 23 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -87,24 +87,24 @@ where
8787
match get_selected_backend() {
8888
#[cfg(curve25519_dalek_backend = "simd")]
8989
BackendKind::Avx2 =>
90-
self::vector::scalar_mul::pippenger::spec_avx2::Pippenger::optional_multiscalar_mul::<I, J>(scalars, points),
90+
vector::scalar_mul::pippenger::spec_avx2::Pippenger::optional_multiscalar_mul::<I, J>(scalars, points),
9191
#[cfg(all(curve25519_dalek_backend = "simd", nightly))]
9292
BackendKind::Avx512 =>
93-
self::vector::scalar_mul::pippenger::spec_avx512ifma_avx512vl::Pippenger::optional_multiscalar_mul::<I, J>(scalars, points),
93+
vector::scalar_mul::pippenger::spec_avx512ifma_avx512vl::Pippenger::optional_multiscalar_mul::<I, J>(scalars, points),
9494
BackendKind::Serial =>
95-
self::serial::scalar_mul::pippenger::Pippenger::optional_multiscalar_mul::<I, J>(scalars, points),
95+
serial::scalar_mul::pippenger::Pippenger::optional_multiscalar_mul::<I, J>(scalars, points),
9696
}
9797
}
9898

9999
#[cfg(feature = "alloc")]
100100
pub(crate) enum VartimePrecomputedStraus {
101101
#[cfg(curve25519_dalek_backend = "simd")]
102-
Avx2(self::vector::scalar_mul::precomputed_straus::spec_avx2::VartimePrecomputedStraus),
102+
Avx2(vector::scalar_mul::precomputed_straus::spec_avx2::VartimePrecomputedStraus),
103103
#[cfg(all(curve25519_dalek_backend = "simd", nightly))]
104104
Avx512ifma(
105-
self::vector::scalar_mul::precomputed_straus::spec_avx512ifma_avx512vl::VartimePrecomputedStraus,
105+
vector::scalar_mul::precomputed_straus::spec_avx512ifma_avx512vl::VartimePrecomputedStraus,
106106
),
107-
Scalar(self::serial::scalar_mul::precomputed_straus::VartimePrecomputedStraus),
107+
Scalar(serial::scalar_mul::precomputed_straus::VartimePrecomputedStraus),
108108
}
109109

110110
#[cfg(feature = "alloc")]
@@ -119,12 +119,12 @@ impl VartimePrecomputedStraus {
119119
match get_selected_backend() {
120120
#[cfg(curve25519_dalek_backend = "simd")]
121121
BackendKind::Avx2 =>
122-
VartimePrecomputedStraus::Avx2(self::vector::scalar_mul::precomputed_straus::spec_avx2::VartimePrecomputedStraus::new(static_points)),
122+
VartimePrecomputedStraus::Avx2(vector::scalar_mul::precomputed_straus::spec_avx2::VartimePrecomputedStraus::new(static_points)),
123123
#[cfg(all(curve25519_dalek_backend = "simd", nightly))]
124124
BackendKind::Avx512 =>
125-
VartimePrecomputedStraus::Avx512ifma(self::vector::scalar_mul::precomputed_straus::spec_avx512ifma_avx512vl::VartimePrecomputedStraus::new(static_points)),
125+
VartimePrecomputedStraus::Avx512ifma(vector::scalar_mul::precomputed_straus::spec_avx512ifma_avx512vl::VartimePrecomputedStraus::new(static_points)),
126126
BackendKind::Serial =>
127-
VartimePrecomputedStraus::Scalar(self::serial::scalar_mul::precomputed_straus::VartimePrecomputedStraus::new(static_points))
127+
VartimePrecomputedStraus::Scalar(serial::scalar_mul::precomputed_straus::VartimePrecomputedStraus::new(static_points))
128128
}
129129
}
130130

@@ -179,19 +179,16 @@ where
179179
match get_selected_backend() {
180180
#[cfg(curve25519_dalek_backend = "simd")]
181181
BackendKind::Avx2 => {
182-
self::vector::scalar_mul::straus::spec_avx2::Straus::multiscalar_mul::<I, J>(
183-
scalars, points,
184-
)
182+
vector::scalar_mul::straus::spec_avx2::Straus::multiscalar_mul::<I, J>(scalars, points)
185183
}
186184
#[cfg(all(curve25519_dalek_backend = "simd", nightly))]
187185
BackendKind::Avx512 => {
188-
self::vector::scalar_mul::straus::spec_avx512ifma_avx512vl::Straus::multiscalar_mul::<
189-
I,
190-
J,
191-
>(scalars, points)
186+
vector::scalar_mul::straus::spec_avx512ifma_avx512vl::Straus::multiscalar_mul::<I, J>(
187+
scalars, points,
188+
)
192189
}
193190
BackendKind::Serial => {
194-
self::serial::scalar_mul::straus::Straus::multiscalar_mul::<I, J>(scalars, points)
191+
serial::scalar_mul::straus::Straus::multiscalar_mul::<I, J>(scalars, points)
195192
}
196193
}
197194
}
@@ -209,21 +206,19 @@ where
209206
match get_selected_backend() {
210207
#[cfg(curve25519_dalek_backend = "simd")]
211208
BackendKind::Avx2 => {
212-
self::vector::scalar_mul::straus::spec_avx2::Straus::optional_multiscalar_mul::<I, J>(
209+
vector::scalar_mul::straus::spec_avx2::Straus::optional_multiscalar_mul::<I, J>(
213210
scalars, points,
214211
)
215212
}
216213
#[cfg(all(curve25519_dalek_backend = "simd", nightly))]
217214
BackendKind::Avx512 => {
218-
self::vector::scalar_mul::straus::spec_avx512ifma_avx512vl::Straus::optional_multiscalar_mul::<
215+
vector::scalar_mul::straus::spec_avx512ifma_avx512vl::Straus::optional_multiscalar_mul::<
219216
I,
220217
J,
221218
>(scalars, points)
222219
}
223220
BackendKind::Serial => {
224-
self::serial::scalar_mul::straus::Straus::optional_multiscalar_mul::<I, J>(
225-
scalars, points,
226-
)
221+
serial::scalar_mul::straus::Straus::optional_multiscalar_mul::<I, J>(scalars, points)
227222
}
228223
}
229224
}
@@ -232,12 +227,12 @@ where
232227
pub fn variable_base_mul(point: &EdwardsPoint, scalar: &Scalar) -> EdwardsPoint {
233228
match get_selected_backend() {
234229
#[cfg(curve25519_dalek_backend = "simd")]
235-
BackendKind::Avx2 => self::vector::scalar_mul::variable_base::spec_avx2::mul(point, scalar),
230+
BackendKind::Avx2 => vector::scalar_mul::variable_base::spec_avx2::mul(point, scalar),
236231
#[cfg(all(curve25519_dalek_backend = "simd", nightly))]
237232
BackendKind::Avx512 => {
238-
self::vector::scalar_mul::variable_base::spec_avx512ifma_avx512vl::mul(point, scalar)
233+
vector::scalar_mul::variable_base::spec_avx512ifma_avx512vl::mul(point, scalar)
239234
}
240-
BackendKind::Serial => self::serial::scalar_mul::variable_base::mul(point, scalar),
235+
BackendKind::Serial => serial::scalar_mul::variable_base::mul(point, scalar),
241236
}
242237
}
243238

@@ -246,11 +241,11 @@ pub fn variable_base_mul(point: &EdwardsPoint, scalar: &Scalar) -> EdwardsPoint
246241
pub fn vartime_double_base_mul(a: &Scalar, A: &EdwardsPoint, b: &Scalar) -> EdwardsPoint {
247242
match get_selected_backend() {
248243
#[cfg(curve25519_dalek_backend = "simd")]
249-
BackendKind::Avx2 => self::vector::scalar_mul::vartime_double_base::spec_avx2::mul(a, A, b),
244+
BackendKind::Avx2 => vector::scalar_mul::vartime_double_base::spec_avx2::mul(a, A, b),
250245
#[cfg(all(curve25519_dalek_backend = "simd", nightly))]
251246
BackendKind::Avx512 => {
252-
self::vector::scalar_mul::vartime_double_base::spec_avx512ifma_avx512vl::mul(a, A, b)
247+
vector::scalar_mul::vartime_double_base::spec_avx512ifma_avx512vl::mul(a, A, b)
253248
}
254-
BackendKind::Serial => self::serial::scalar_mul::vartime_double_base::mul(a, A, b),
249+
BackendKind::Serial => serial::scalar_mul::vartime_double_base::mul(a, A, b),
255250
}
256251
}

‎curve25519-dalek/src/backend/serial/curve_models/mod.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ impl<'a> Neg for &'a AffineNielsPoint {
527527
// ------------------------------------------------------------------------
528528

529529
impl Debug for ProjectivePoint {
530-
fn fmt(&self, f: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result {
530+
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
531531
write!(
532532
f,
533533
"ProjectivePoint{{\n\tX: {:?},\n\tY: {:?},\n\tZ: {:?}\n}}",
@@ -537,7 +537,7 @@ impl Debug for ProjectivePoint {
537537
}
538538

539539
impl Debug for CompletedPoint {
540-
fn fmt(&self, f: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result {
540+
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
541541
write!(
542542
f,
543543
"CompletedPoint{{\n\tX: {:?},\n\tY: {:?},\n\tZ: {:?},\n\tT: {:?}\n}}",
@@ -547,7 +547,7 @@ impl Debug for CompletedPoint {
547547
}
548548

549549
impl Debug for AffineNielsPoint {
550-
fn fmt(&self, f: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result {
550+
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
551551
write!(
552552
f,
553553
"AffineNielsPoint{{\n\ty_plus_x: {:?},\n\ty_minus_x: {:?},\n\txy2d: {:?}\n}}",
@@ -557,7 +557,7 @@ impl Debug for AffineNielsPoint {
557557
}
558558

559559
impl Debug for ProjectiveNielsPoint {
560-
fn fmt(&self, f: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result {
560+
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
561561
write!(f, "ProjectiveNielsPoint{{\n\tY_plus_X: {:?},\n\tY_minus_X: {:?},\n\tZ: {:?},\n\tT2d: {:?}\n}}",
562562
&self.Y_plus_X, &self.Y_minus_X, &self.Z, &self.T2d)
563563
}

‎curve25519-dalek/src/backend/serial/fiat_u32/field.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ use fiat_crypto::curve25519_32::*;
5858
pub struct FieldElement2625(pub(crate) fiat_25519_tight_field_element);
5959

6060
impl Debug for FieldElement2625 {
61-
fn fmt(&self, f: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result {
61+
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
6262
write!(f, "FieldElement2625({:?})", &(self.0).0[..])
6363
}
6464
}

‎curve25519-dalek/src/backend/serial/fiat_u64/field.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ use fiat_crypto::curve25519_64::*;
4747
pub struct FieldElement51(pub(crate) fiat_25519_tight_field_element);
4848

4949
impl Debug for FieldElement51 {
50-
fn fmt(&self, f: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result {
50+
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
5151
write!(f, "FieldElement51({:?})", &(self.0).0[..])
5252
}
5353
}

‎curve25519-dalek/src/backend/serial/u32/field.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ use zeroize::Zeroize;
5454
pub struct FieldElement2625(pub(crate) [u32; 10]);
5555

5656
impl Debug for FieldElement2625 {
57-
fn fmt(&self, f: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result {
57+
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
5858
write!(f, "FieldElement2625({:?})", &self.0[..])
5959
}
6060
}

‎curve25519-dalek/src/backend/serial/u32/scalar.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ use crate::constants;
2424
pub struct Scalar29(pub [u32; 9]);
2525

2626
impl Debug for Scalar29 {
27-
fn fmt(&self, f: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result {
27+
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
2828
write!(f, "Scalar29: {:?}", &self.0[..])
2929
}
3030
}

‎curve25519-dalek/src/backend/serial/u64/field.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ use zeroize::Zeroize;
4343
pub struct FieldElement51(pub(crate) [u64; 5]);
4444

4545
impl Debug for FieldElement51 {
46-
fn fmt(&self, f: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result {
46+
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
4747
write!(f, "FieldElement51({:?})", &self.0[..])
4848
}
4949
}

‎curve25519-dalek/src/backend/serial/u64/scalar.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ use crate::constants;
2525
pub struct Scalar52(pub [u64; 5]);
2626

2727
impl Debug for Scalar52 {
28-
fn fmt(&self, f: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result {
28+
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
2929
write!(f, "Scalar52: {:?}", &self.0[..])
3030
}
3131
}

‎curve25519-dalek/src/edwards.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ impl ConstantTimeEq for CompressedEdwardsY {
171171
}
172172

173173
impl Debug for CompressedEdwardsY {
174-
fn fmt(&self, f: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result {
174+
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
175175
write!(f, "CompressedEdwardsY: {:?}", self.as_bytes())
176176
}
177177
}
@@ -302,7 +302,7 @@ impl<'de> Deserialize<'de> for EdwardsPoint {
302302
impl<'de> Visitor<'de> for EdwardsPointVisitor {
303303
type Value = EdwardsPoint;
304304

305-
fn expecting(&self, formatter: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result {
305+
fn expecting(&self, formatter: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
306306
formatter.write_str("a valid point in Edwards y + sign format")
307307
}
308308

@@ -338,7 +338,7 @@ impl<'de> Deserialize<'de> for CompressedEdwardsY {
338338
impl<'de> Visitor<'de> for CompressedEdwardsYVisitor {
339339
type Value = CompressedEdwardsY;
340340

341-
fn expecting(&self, formatter: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result {
341+
fn expecting(&self, formatter: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
342342
formatter.write_str("32 bytes of data")
343343
}
344344

@@ -1053,7 +1053,7 @@ macro_rules! impl_basepoint_table {
10531053
}
10541054

10551055
impl Debug for $name {
1056-
fn fmt(&self, f: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result {
1056+
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
10571057
write!(f, "{:?}([\n", stringify!($name))?;
10581058
for i in 0..32 {
10591059
write!(f, "\t{:?},\n", &self.0[i])?;
@@ -1264,7 +1264,7 @@ impl EdwardsPoint {
12641264
// ------------------------------------------------------------------------
12651265

12661266
impl Debug for EdwardsPoint {
1267-
fn fmt(&self, f: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result {
1267+
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
12681268
write!(
12691269
f,
12701270
"EdwardsPoint{{\n\tX: {:?},\n\tY: {:?},\n\tZ: {:?},\n\tT: {:?}\n}}",

‎curve25519-dalek/src/ristretto.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ impl<'de> Deserialize<'de> for RistrettoPoint {
407407
impl<'de> Visitor<'de> for RistrettoPointVisitor {
408408
type Value = RistrettoPoint;
409409

410-
fn expecting(&self, formatter: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result {
410+
fn expecting(&self, formatter: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
411411
formatter.write_str("a valid point in Ristretto format")
412412
}
413413

@@ -443,7 +443,7 @@ impl<'de> Deserialize<'de> for CompressedRistretto {
443443
impl<'de> Visitor<'de> for CompressedRistrettoVisitor {
444444
type Value = CompressedRistretto;
445445

446-
fn expecting(&self, formatter: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result {
446+
fn expecting(&self, formatter: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
447447
formatter.write_str("32 bytes of data")
448448
}
449449

@@ -1155,13 +1155,13 @@ impl ConditionallySelectable for RistrettoPoint {
11551155
// ------------------------------------------------------------------------
11561156

11571157
impl Debug for CompressedRistretto {
1158-
fn fmt(&self, f: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result {
1158+
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
11591159
write!(f, "CompressedRistretto: {:?}", self.as_bytes())
11601160
}
11611161
}
11621162

11631163
impl Debug for RistrettoPoint {
1164-
fn fmt(&self, f: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result {
1164+
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
11651165
let coset = self.coset4();
11661166
write!(
11671167
f,

0 commit comments

Comments
 (0)