1.61 const update

ABouttefeux · Jun 19, 2022 · 2996af9 · 2996af9
1 parent 5db8e10
commit 2996af9
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 46 deletions.
diff --git a/src/number.rs b/src/number.rs
@@ -19,12 +19,12 @@ where
     D: num_traits::sign::Unsigned + std::cmp::Ord + Copy,
 {
     /// Get tje integer part of the number
-    pub fn integer(&self) -> I {
+    pub const fn integer(&self) -> I {
         self.integer
     }
 
     /// Get the decimal part of the number as it is stored (as raw data)
-    pub fn decimal(&self) -> D {
+    pub const fn decimal(&self) -> D {
         self.decimal
     }
 }

diff --git a/src/simulation/monte_carlo/heat_bath.rs b/src/simulation/monte_carlo/heat_bath.rs
@@ -48,11 +48,12 @@ pub struct HeatBathSweep<Rng: rand::Rng> {
 
 impl<Rng: rand::Rng> HeatBathSweep<Rng> {
     /// Create a new Self form a rng.
-    pub fn new(rng: Rng) -> Self {
+    pub const fn new(rng: Rng) -> Self {
         Self { rng }
     }
 
     /// Absorbed self and return the RNG as owned. It essentially deconstruct the structure.
+    #[allow(clippy::missing_const_for_fn)] // false positive
     pub fn rng_owned(self) -> Rng {
         self.rng
     }
@@ -63,7 +64,7 @@ impl<Rng: rand::Rng> HeatBathSweep<Rng> {
     }
 
     /// Get a reference to the rng.
-    pub fn rng(&self) -> &Rng {
+    pub const fn rng(&self) -> &Rng {
         &self.rng
     }
 

diff --git a/src/simulation/monte_carlo/hybrid.rs b/src/simulation/monte_carlo/hybrid.rs
@@ -103,7 +103,7 @@ where
     }
 
     /// Getter for the reference hold by self.
-    pub fn data(&self) -> &MC {
+    pub const fn data(&self) -> &MC {
         self.data
     }
 }
@@ -344,20 +344,20 @@ where
 {
     getter!(
         /// get the first method
-        pub,
+        pub const,
         method_1,
         MC1
     );
 
     getter!(
         /// get the second method
-        pub,
+        pub const,
         method_2,
         MC2
     );
 
     /// Create a new Self from two methods
-    pub fn new(method_1: MC1, method_2: MC2) -> Self {
+    pub const fn new(method_1: MC1, method_2: MC2) -> Self {
         Self {
             method_1,
             method_2,
@@ -366,6 +366,7 @@ where
     }
 
     /// Deconstruct the structure ang gives back both methods
+    #[allow(clippy::missing_const_for_fn)] // false positive
     pub fn deconstruct(self) -> (MC1, MC2) {
         (self.method_1, self.method_2)
     }

diff --git a/src/simulation/monte_carlo/hybrid_monte_carlo.rs b/src/simulation/monte_carlo/hybrid_monte_carlo.rs
@@ -89,12 +89,12 @@ where
 {
     getter!(
         /// Get a ref to the rng.
-        pub rng() -> Rng
+        pub const rng() -> Rng
     );
 
     project!(
         /// Get the integrator.
-        pub internal.integrator() -> &I
+        pub const internal.integrator() -> &I
     );
 
     project_mut!(
@@ -104,20 +104,20 @@ where
 
     project!(
         /// Get `delta_t`.
-        pub internal.delta_t() -> Real
+        pub const internal.delta_t() -> Real
     );
 
     project!(
         /// Get the number of steps.
-        pub internal.number_of_steps() -> usize
+        pub const internal.number_of_steps() -> usize
     );
 
     /// gives the following parameter for the HCM :
     /// - delta_t is the step size per integration of the equation of motion
     /// - number_of_steps is the number of time
     /// - integrator is the methods to solve the equation of motion
     /// - rng, a random number generator
-    pub fn new(delta_t: Real, number_of_steps: usize, integrator: I, rng: Rng) -> Self {
+    pub const fn new(delta_t: Real, number_of_steps: usize, integrator: I, rng: Rng) -> Self {
         Self {
             internal: HybridMonteCarloInternal::<LatticeStateEFSyncDefault<State, D>, I, D>::new(
                 delta_t,
@@ -134,6 +134,7 @@ where
     }
 
     /// Get the last probably of acceptance of the random change.
+    #[allow(clippy::missing_const_for_fn)] // false positive
     pub fn rng_owned(self) -> Rng {
         self.rng
     }
@@ -219,27 +220,27 @@ where
 {
     getter!(
         /// Get the integrator.
-        pub,
+        pub const,
         integrator,
         I
     );
 
     getter_copy!(
         /// Get `delta_t`.
-        pub,
+        pub const,
         delta_t,
         Real
     );
 
     getter_copy!(
         /// Get the number of steps.
-        pub,
+        pub const,
         number_of_steps,
         usize
     );
 
     /// see [HybridMonteCarlo::new]
-    pub fn new(delta_t: Real, number_of_steps: usize, integrator: I) -> Self {
+    pub const fn new(delta_t: Real, number_of_steps: usize, integrator: I) -> Self {
         Self {
             delta_t,
             number_of_steps,
@@ -340,14 +341,14 @@ where
 {
     getter!(
         /// Get a ref to the rng.
-        pub,
+        pub const,
         rng,
         Rng
     );
 
     project!(
         /// Get the integrator.
-        pub,
+        pub const,
         integrator,
         internal,
         &I
@@ -363,15 +364,15 @@ where
 
     project!(
         /// Get `delta_t`.
-        pub,
+        pub const,
         delta_t,
         internal,
         Real
     );
 
     project!(
         /// Get the number of steps.
-        pub,
+        pub const,
         number_of_steps,
         internal,
         usize
@@ -382,7 +383,7 @@ where
     /// - number_of_steps is the number of time
     /// - integrator is the method to solve the equation of motion
     /// - rng, a random number generator
-    pub fn new(delta_t: Real, number_of_steps: usize, integrator: I, rng: Rng) -> Self {
+    pub const fn new(delta_t: Real, number_of_steps: usize, integrator: I, rng: Rng) -> Self {
         Self {
             internal: HybridMonteCarloInternalDiagnostics::<
                 LatticeStateEFSyncDefault<State, D>,
@@ -399,16 +400,17 @@ where
     }
 
     /// Get the last probably of acceptance of the random change.
-    pub fn prob_replace_last(&self) -> Real {
+    pub const fn prob_replace_last(&self) -> Real {
         self.internal.prob_replace_last()
     }
 
     /// Get if last step has accepted the replacement.
-    pub fn has_replace_last(&self) -> bool {
+    pub const fn has_replace_last(&self) -> bool {
         self.internal.has_replace_last()
     }
 
     /// Get the last probably of acceptance of the random change.
+    #[allow(clippy::missing_const_for_fn)] // false positive
     pub fn rng_owned(self) -> Rng {
         self.rng
     }
@@ -493,27 +495,27 @@ where
 {
     getter!(
         /// Get the integrator.
-        pub,
+        pub const,
         integrator,
         I
     );
 
     getter_copy!(
         /// Get `delta_t`.
-        pub,
+        pub const,
         delta_t,
         Real
     );
 
     getter_copy!(
         /// Get the number of steps.
-        pub,
+        pub const,
         number_of_steps,
         usize
     );
 
     /// see [HybridMonteCarlo::new]
-    pub fn new(delta_t: Real, number_of_steps: usize, integrator: I) -> Self {
+    pub const fn new(delta_t: Real, number_of_steps: usize, integrator: I) -> Self {
         Self {
             delta_t,
             number_of_steps,
@@ -525,12 +527,12 @@ where
     }
 
     /// Get the last probably of acceptance of the random change.
-    pub fn prob_replace_last(&self) -> Real {
+    pub const fn prob_replace_last(&self) -> Real {
         self.prob_replace_last
     }
 
     /// Get if last step has accepted the replacement.
-    pub fn has_replace_last(&self) -> bool {
+    pub const fn has_replace_last(&self) -> bool {
         self.has_replace_last
     }
 

diff --git a/src/simulation/monte_carlo/metropolis_hastings.rs b/src/simulation/monte_carlo/metropolis_hastings.rs
@@ -303,28 +303,28 @@ pub struct MetropolisHastingsDeltaDiagnostic<Rng: rand::Rng> {
 impl<Rng: rand::Rng> MetropolisHastingsDeltaDiagnostic<Rng> {
     getter_copy!(
         /// Get the last probably of acceptance of the random change.
-        pub,
+        pub const,
         prob_replace_last,
         Real
     );
 
     getter_copy!(
         /// Get if last step has accepted the replacement.
-        pub,
+        pub const,
         has_replace_last,
         bool
     );
 
     getter!(
         /// Get a ref to the rng.
-        pub,
+        pub const,
         rng,
         Rng
     );
 
     getter_copy!(
         /// Get the spread parameter.
-        pub spread() -> Real
+        pub const spread() -> Real
     );
 
     /// Get a mutable reference to the rng.
@@ -351,6 +351,7 @@ impl<Rng: rand::Rng> MetropolisHastingsDeltaDiagnostic<Rng> {
     }
 
     /// Absorbs self and return the RNG as owned. It essentially deconstruct the structure.
+    #[allow(clippy::missing_const_for_fn)] // false positive
     pub fn rng_owned(self) -> Rng {
         self.rng
     }

diff --git a/src/simulation/monte_carlo/metropolis_hastings_sweep.rs b/src/simulation/monte_carlo/metropolis_hastings_sweep.rs
@@ -63,7 +63,7 @@ pub struct MetropolisHastingsSweep<Rng: rand::Rng> {
 impl<Rng: rand::Rng> MetropolisHastingsSweep<Rng> {
     getter!(
         /// Get a ref to the rng.
-        pub,
+        pub const,
         rng,
         Rng
     );
@@ -88,16 +88,17 @@ impl<Rng: rand::Rng> MetropolisHastingsSweep<Rng> {
     }
 
     /// Get the mean of last probably of acceptance of the random change.
-    pub fn prob_replace_mean(&self) -> Real {
+    pub const fn prob_replace_mean(&self) -> Real {
         self.prob_replace_mean
     }
 
     /// Number of accepted change during last sweep
-    pub fn number_replace_last(&self) -> usize {
+    pub const fn number_replace_last(&self) -> usize {
         self.number_replace_last
     }
 
     /// Get the last probably of acceptance of the random change.
+    #[allow(clippy::missing_const_for_fn)] // false positive
     pub fn rng_owned(self) -> Rng {
         self.rng
     }

diff --git a/src/simulation/monte_carlo/mod.rs b/src/simulation/monte_carlo/mod.rs
@@ -226,13 +226,13 @@ where
 {
     getter!(
         /// Get a ref to the rng.
-        pub,
+        pub const,
         rng,
         Rng
     );
 
     /// Create the wrapper.
-    pub fn new(mcd: MCD, rng: Rng) -> Self {
+    pub const fn new(mcd: MCD, rng: Rng) -> Self {
         Self {
             mcd,
             rng,
@@ -241,12 +241,13 @@ where
     }
 
     /// deconstruct the structure to get back the rng if necessary
+    #[allow(clippy::missing_const_for_fn)] // false positive
     pub fn deconstruct(self) -> (MCD, Rng) {
         (self.mcd, self.rng)
     }
 
     /// Get a reference to the [`MonteCarloDefault`] inside the wrapper.
-    pub fn mcd(&self) -> &MCD {
+    pub const fn mcd(&self) -> &MCD {
         &self.mcd
     }