From 9e04a586c0da06bcf25a1b90585d34745adca2fe Mon Sep 17 00:00:00 2001 From: Tony Arcieri Date: Sun, 9 Nov 2025 08:49:57 -0700 Subject: [PATCH] curve: fully migrate to 2018 module conventions (#844) Enforced via the newly added `clippy::mod_module_files` lint. Previously a mixture of 2015 (`mod.rs`) module files along with the 2018 `foo.rs` and `foo/` approach. All of the toplevel modules (`edwards`, `field`, `montgomery`, and `scalar`) were using the 2018 convention, except for `backend`, `ristretto`, and the recently added `lizard` were using the 2015 convention. This renames the files so everything follows the 2018 convention, and applies the afforementioned clippy lint which will error if anyone tries to add new files using the 2015 convention. --- curve25519-dalek/src/{backend/mod.rs => backend.rs} | 0 curve25519-dalek/src/backend/{serial/mod.rs => serial.rs} | 0 .../backend/serial/{curve_models/mod.rs => curve_models.rs} | 0 .../src/backend/serial/{fiat_u32/mod.rs => fiat_u32.rs} | 4 ++-- .../src/backend/serial/{fiat_u64/mod.rs => fiat_u64.rs} | 4 ++-- .../src/backend/serial/{scalar_mul/mod.rs => scalar_mul.rs} | 0 curve25519-dalek/src/backend/serial/{u32/mod.rs => u32.rs} | 0 curve25519-dalek/src/backend/serial/{u64/mod.rs => u64.rs} | 0 curve25519-dalek/src/backend/{vector/mod.rs => vector.rs} | 2 +- curve25519-dalek/src/backend/vector/{avx2/mod.rs => avx2.rs} | 2 +- curve25519-dalek/src/backend/vector/{ifma/mod.rs => ifma.rs} | 2 +- .../src/backend/vector/{scalar_mul/mod.rs => scalar_mul.rs} | 0 curve25519-dalek/src/lib.rs | 1 + curve25519-dalek/src/{lizard/mod.rs => lizard.rs} | 0 curve25519-dalek/src/{ristretto/mod.rs => ristretto.rs} | 0 15 files changed, 8 insertions(+), 7 deletions(-) rename curve25519-dalek/src/{backend/mod.rs => backend.rs} (100%) rename curve25519-dalek/src/backend/{serial/mod.rs => serial.rs} (100%) rename curve25519-dalek/src/backend/serial/{curve_models/mod.rs => curve_models.rs} (100%) rename curve25519-dalek/src/backend/serial/{fiat_u32/mod.rs => fiat_u32.rs} (92%) rename curve25519-dalek/src/backend/serial/{fiat_u64/mod.rs => fiat_u64.rs} (93%) rename curve25519-dalek/src/backend/serial/{scalar_mul/mod.rs => scalar_mul.rs} (100%) rename curve25519-dalek/src/backend/serial/{u32/mod.rs => u32.rs} (100%) rename curve25519-dalek/src/backend/serial/{u64/mod.rs => u64.rs} (100%) rename curve25519-dalek/src/backend/{vector/mod.rs => vector.rs} (88%) rename curve25519-dalek/src/backend/vector/{avx2/mod.rs => avx2.rs} (88%) rename curve25519-dalek/src/backend/vector/{ifma/mod.rs => ifma.rs} (86%) rename curve25519-dalek/src/backend/vector/{scalar_mul/mod.rs => scalar_mul.rs} (100%) rename curve25519-dalek/src/{lizard/mod.rs => lizard.rs} (100%) rename curve25519-dalek/src/{ristretto/mod.rs => ristretto.rs} (100%) diff --git a/curve25519-dalek/src/backend/mod.rs b/curve25519-dalek/src/backend.rs similarity index 100% rename from curve25519-dalek/src/backend/mod.rs rename to curve25519-dalek/src/backend.rs diff --git a/curve25519-dalek/src/backend/serial/mod.rs b/curve25519-dalek/src/backend/serial.rs similarity index 100% rename from curve25519-dalek/src/backend/serial/mod.rs rename to curve25519-dalek/src/backend/serial.rs diff --git a/curve25519-dalek/src/backend/serial/curve_models/mod.rs b/curve25519-dalek/src/backend/serial/curve_models.rs similarity index 100% rename from curve25519-dalek/src/backend/serial/curve_models/mod.rs rename to curve25519-dalek/src/backend/serial/curve_models.rs diff --git a/curve25519-dalek/src/backend/serial/fiat_u32/mod.rs b/curve25519-dalek/src/backend/serial/fiat_u32.rs similarity index 92% rename from curve25519-dalek/src/backend/serial/fiat_u32/mod.rs rename to curve25519-dalek/src/backend/serial/fiat_u32.rs index 974316e..a12e145 100644 --- a/curve25519-dalek/src/backend/serial/fiat_u32/mod.rs +++ b/curve25519-dalek/src/backend/serial/fiat_u32.rs @@ -17,10 +17,10 @@ //! This uses the formally-verified field arithmetic generated by the //! [fiat-crypto project](https://github.com/mit-plv/fiat-crypto) -#[path = "../u32/scalar.rs"] +#[path = "./u32/scalar.rs"] pub mod scalar; pub mod field; -#[path = "../u32/constants.rs"] +#[path = "./u32/constants.rs"] pub mod constants; diff --git a/curve25519-dalek/src/backend/serial/fiat_u64/mod.rs b/curve25519-dalek/src/backend/serial/fiat_u64.rs similarity index 93% rename from curve25519-dalek/src/backend/serial/fiat_u64/mod.rs rename to curve25519-dalek/src/backend/serial/fiat_u64.rs index 8c83062..d9dc812 100644 --- a/curve25519-dalek/src/backend/serial/fiat_u64/mod.rs +++ b/curve25519-dalek/src/backend/serial/fiat_u64.rs @@ -19,10 +19,10 @@ //! (allowing the CPU to compute two carry chains in parallel). These //! will be used if available. -#[path = "../u64/scalar.rs"] +#[path = "./u64/scalar.rs"] pub mod scalar; pub mod field; -#[path = "../u64/constants.rs"] +#[path = "./u64/constants.rs"] pub mod constants; diff --git a/curve25519-dalek/src/backend/serial/scalar_mul/mod.rs b/curve25519-dalek/src/backend/serial/scalar_mul.rs similarity index 100% rename from curve25519-dalek/src/backend/serial/scalar_mul/mod.rs rename to curve25519-dalek/src/backend/serial/scalar_mul.rs diff --git a/curve25519-dalek/src/backend/serial/u32/mod.rs b/curve25519-dalek/src/backend/serial/u32.rs similarity index 100% rename from curve25519-dalek/src/backend/serial/u32/mod.rs rename to curve25519-dalek/src/backend/serial/u32.rs diff --git a/curve25519-dalek/src/backend/serial/u64/mod.rs b/curve25519-dalek/src/backend/serial/u64.rs similarity index 100% rename from curve25519-dalek/src/backend/serial/u64/mod.rs rename to curve25519-dalek/src/backend/serial/u64.rs diff --git a/curve25519-dalek/src/backend/vector/mod.rs b/curve25519-dalek/src/backend/vector.rs similarity index 88% rename from curve25519-dalek/src/backend/vector/mod.rs rename to curve25519-dalek/src/backend/vector.rs index 3a91044..856637f 100644 --- a/curve25519-dalek/src/backend/vector/mod.rs +++ b/curve25519-dalek/src/backend/vector.rs @@ -9,7 +9,7 @@ // - isis agora lovecruft // - Henry de Valence -#![doc = include_str!("../../../docs/parallel-formulas.md")] +#![doc = include_str!("../../docs/parallel-formulas.md")] #[allow(missing_docs)] pub mod packed_simd; diff --git a/curve25519-dalek/src/backend/vector/avx2/mod.rs b/curve25519-dalek/src/backend/vector/avx2.rs similarity index 88% rename from curve25519-dalek/src/backend/vector/avx2/mod.rs rename to curve25519-dalek/src/backend/vector/avx2.rs index fba39f0..da71022 100644 --- a/curve25519-dalek/src/backend/vector/avx2/mod.rs +++ b/curve25519-dalek/src/backend/vector/avx2.rs @@ -9,7 +9,7 @@ // - isis agora lovecruft // - Henry de Valence -#![doc = include_str!("../../../../docs/avx2-notes.md")] +#![doc = include_str!("../../../docs/avx2-notes.md")] pub(crate) mod field; diff --git a/curve25519-dalek/src/backend/vector/ifma/mod.rs b/curve25519-dalek/src/backend/vector/ifma.rs similarity index 86% rename from curve25519-dalek/src/backend/vector/ifma/mod.rs rename to curve25519-dalek/src/backend/vector/ifma.rs index f48748d..d99914b 100644 --- a/curve25519-dalek/src/backend/vector/ifma/mod.rs +++ b/curve25519-dalek/src/backend/vector/ifma.rs @@ -7,7 +7,7 @@ // Authors: // - Henry de Valence -#![doc = include_str!("../../../../docs/ifma-notes.md")] +#![doc = include_str!("../../../docs/ifma-notes.md")] #[allow(missing_docs)] pub mod field; diff --git a/curve25519-dalek/src/backend/vector/scalar_mul/mod.rs b/curve25519-dalek/src/backend/vector/scalar_mul.rs similarity index 100% rename from curve25519-dalek/src/backend/vector/scalar_mul/mod.rs rename to curve25519-dalek/src/backend/vector/scalar_mul.rs diff --git a/curve25519-dalek/src/lib.rs b/curve25519-dalek/src/lib.rs index 6239181..dafd617 100644 --- a/curve25519-dalek/src/lib.rs +++ b/curve25519-dalek/src/lib.rs @@ -24,6 +24,7 @@ //------------------------------------------------------------------------ #![cfg_attr(allow_unused_unsafe, allow(unused_unsafe))] #![warn( + clippy::mod_module_files, clippy::unwrap_used, missing_docs, rust_2018_idioms, diff --git a/curve25519-dalek/src/lizard/mod.rs b/curve25519-dalek/src/lizard.rs similarity index 100% rename from curve25519-dalek/src/lizard/mod.rs rename to curve25519-dalek/src/lizard.rs diff --git a/curve25519-dalek/src/ristretto/mod.rs b/curve25519-dalek/src/ristretto.rs similarity index 100% rename from curve25519-dalek/src/ristretto/mod.rs rename to curve25519-dalek/src/ristretto.rs