MSRV 1.85, Edition 2024 (#28)

dhardy · web-flow · commit 26da522a0a4f · 2025-09-11T18:14:22.000+01:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -69,7 +69,7 @@ jobs:
           - os: ubuntu-latest
             target: x86_64-unknown-linux-gnu
             variant: MSRV
-            toolchain: 1.63.0
+            toolchain: 1.85.0
           - os: ubuntu-latest
             deps: sudo apt-get update ; sudo apt install gcc-multilib
             target: i686-unknown-linux-gnu
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.6.0] — Unreleased
+- Bump to MSRV 1.85.0 and Edition 2024 in line with `rand` (#27)
+
 ## [0.5.2]
 
 ### API Changes
diff --git a/Cargo.lock.msrv b/Cargo.lock.msrv
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,8 +12,8 @@ Sampling from random number distributions
 """
 keywords = ["random", "rng", "distribution", "probability"]
 categories = ["algorithms", "no-std"]
-edition = "2021"
-rust-version = "1.63"
+edition = "2024"
+rust-version = "1.85"
 include = ["/src", "LICENSE-*", "README.md", "CHANGELOG.md", "COPYRIGHT"]
 
 [package.metadata.docs.rs]
diff --git a/benches/Cargo.toml b/benches/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "benches"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 
 [dependencies]
diff --git a/benches/benches/distr.rs b/benches/benches/distr.rs
@@ -6,7 +6,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use criterion::{criterion_group, criterion_main, Criterion, Throughput};
+use criterion::{Criterion, Throughput, criterion_group, criterion_main};
 use criterion_cycles_per_byte::CyclesPerByte;
 
 use rand::prelude::*;
diff --git a/benches/benches/weighted.rs b/benches/benches/weighted.rs
@@ -6,7 +6,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, black_box, criterion_group, criterion_main};
 use rand::distr::weighted::WeightedIndex;
 use rand::prelude::*;
 use rand::seq::index::sample_weighted;
diff --git a/distr_test/Cargo.toml b/distr_test/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "distr_test"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 
 [dev-dependencies]
diff --git a/distr_test/tests/cdf.rs b/distr_test/tests/cdf.rs
@@ -252,11 +252,7 @@ fn studend_t() {
     fn cdf(x: f64, df: f64) -> f64 {
         let h = df / (df + x.powi(2));
         let ib = 0.5 * h.inc_beta(df / 2.0, 0.5, 0.5.ln_beta(df / 2.0));
-        if x < 0.0 {
-            ib
-        } else {
-            1.0 - ib
-        }
+        if x < 0.0 { ib } else { 1.0 - ib }
     }
 
     let parameters = [1.0, 10.0, 50.0];
@@ -436,11 +432,7 @@ fn poisson() {
         let dist = Poisson::new(lambda).unwrap();
         let analytic = statrs::distribution::Poisson::new(lambda).unwrap();
         test_discrete::<f64, Poisson<f64>, _>(seed as u64, dist, |k| {
-            if k < 0 {
-                0.0
-            } else {
-                analytic.cdf(k as u64)
-            }
+            if k < 0 { 0.0 } else { analytic.cdf(k as u64) }
         });
     }
 }
diff --git a/distr_test/tests/weighted.rs b/distr_test/tests/weighted.rs
@@ -27,11 +27,7 @@ fn make_cdf(num: usize, f: impl Fn(i64) -> f64) -> impl Fn(i64) -> f64 {
     }
 
     move |i| {
-        if i < 0 {
-            0.0
-        } else {
-            cdf[i as usize]
-        }
+        if i < 0 { 0.0 } else { cdf[i as usize] }
     }
 }
 
@@ -167,11 +163,7 @@ fn choose_two_weighted_indexed() {
         assert!((cdf.last().unwrap() - 1.0).abs() < 1e-9);
 
         let cdf = |i| {
-            if i < 0 {
-                0.0
-            } else {
-                cdf[i as usize]
-            }
+            if i < 0 { 0.0 } else { cdf[i as usize] }
         };
 
         test_discrete(0, distr, cdf);
diff --git a/src/binomial.rs b/src/binomial.rs
@@ -204,11 +204,7 @@ fn binv<R: Rng + ?Sized>(binv: Binv, flipped: bool, rng: &mut R) -> u64 {
         break x;
     };
 
-    if flipped {
-        binv.n - sample
-    } else {
-        sample
-    }
+    if flipped { binv.n - sample } else { sample }
 }
 
 #[allow(clippy::many_single_char_names)] // Same names as in the reference.
@@ -377,11 +373,7 @@ fn btpe<R: Rng + ?Sized>(btpe: Btpe, flipped: bool, rng: &mut R) -> u64 {
     assert!(y >= 0);
     let y = y as u64;
 
-    if flipped {
-        btpe.n - y
-    } else {
-        y
-    }
+    if flipped { btpe.n - y } else { y }
 }
 
 impl Distribution<u64> for Binomial {
diff --git a/src/exponential.rs b/src/exponential.rs
@@ -10,7 +10,7 @@
 //! The exponential distribution `Exp(λ)`.
 
 use crate::utils::ziggurat;
-use crate::{ziggurat_tables, Distribution};
+use crate::{Distribution, ziggurat_tables};
 use core::fmt;
 use num_traits::Float;
 use rand::Rng;
diff --git a/src/frechet.rs b/src/frechet.rs
@@ -192,10 +192,12 @@ mod tests {
                 }
             }
         }
-        assert!(proportions
-            .iter()
-            .zip(&probabilities)
-            .all(|(p_hat, p)| (p_hat - p).abs() < 0.003))
+        assert!(
+            proportions
+                .iter()
+                .zip(&probabilities)
+                .all(|(p_hat, p)| (p_hat - p).abs() < 0.003)
+        )
     }
 
     #[test]
diff --git a/src/gumbel.rs b/src/gumbel.rs
@@ -160,10 +160,12 @@ mod tests {
                 }
             }
         }
-        assert!(proportions
-            .iter()
-            .zip(&probabilities)
-            .all(|(p_hat, p)| (p_hat - p).abs() < 0.003))
+        assert!(
+            proportions
+                .iter()
+                .zip(&probabilities)
+                .all(|(p_hat, p)| (p_hat - p).abs() < 0.003)
+        )
     }
 
     #[test]
diff --git a/src/hypergeometric.rs b/src/hypergeometric.rs
@@ -4,8 +4,8 @@ use crate::Distribution;
 use core::fmt;
 #[allow(unused_imports)]
 use num_traits::Float;
-use rand::distr::uniform::Uniform;
 use rand::Rng;
+use rand::distr::uniform::Uniform;
 
 #[derive(Clone, Copy, Debug, PartialEq)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
diff --git a/src/lib.rs b/src/lib.rs
@@ -92,8 +92,8 @@ extern crate std;
 use rand::Rng;
 
 pub use rand::distr::{
-    uniform, Alphanumeric, Bernoulli, BernoulliError, Distribution, Iter, Open01, OpenClosed01,
-    StandardUniform, Uniform,
+    Alphanumeric, Bernoulli, BernoulliError, Distribution, Iter, Open01, OpenClosed01,
+    StandardUniform, Uniform, uniform,
 };
 
 pub use self::beta::{Beta, Error as BetaError};
diff --git a/src/normal.rs b/src/normal.rs
@@ -10,7 +10,7 @@
 //! The Normal and derived distributions.
 
 use crate::utils::ziggurat;
-use crate::{ziggurat_tables, Distribution, Open01};
+use crate::{Distribution, Open01, ziggurat_tables};
 use core::fmt;
 use num_traits::Float;
 use rand::Rng;
diff --git a/src/unit_ball.rs b/src/unit_ball.rs
@@ -6,7 +6,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use crate::{uniform::SampleUniform, Distribution, Uniform};
+use crate::{Distribution, Uniform, uniform::SampleUniform};
 use num_traits::Float;
 use rand::Rng;
 
diff --git a/src/unit_circle.rs b/src/unit_circle.rs
@@ -6,7 +6,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use crate::{uniform::SampleUniform, Distribution, Uniform};
+use crate::{Distribution, Uniform, uniform::SampleUniform};
 use num_traits::Float;
 use rand::Rng;
 
diff --git a/src/unit_disc.rs b/src/unit_disc.rs
@@ -6,7 +6,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use crate::{uniform::SampleUniform, Distribution, Uniform};
+use crate::{Distribution, Uniform, uniform::SampleUniform};
 use num_traits::Float;
 use rand::Rng;
 
diff --git a/src/unit_sphere.rs b/src/unit_sphere.rs
@@ -6,7 +6,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use crate::{uniform::SampleUniform, Distribution, Uniform};
+use crate::{Distribution, Uniform, uniform::SampleUniform};
 use num_traits::Float;
 use rand::Rng;
 
diff --git a/src/utils.rs b/src/utils.rs
@@ -11,8 +11,8 @@
 use crate::ziggurat_tables;
 #[allow(unused_imports)]
 use num_traits::Float; // Used for `no_std` to get `f64::abs()` working before `rustc 1.84`
-use rand::distr::hidden_export::IntoFloat;
 use rand::Rng;
+use rand::distr::hidden_export::IntoFloat;
 
 /// An RNG yielding a constant value
 #[cfg(test)]
diff --git a/src/weighted/weighted_alias.rs b/src/weighted/weighted_alias.rs
@@ -10,7 +10,7 @@
 //! indices with probabilities proportional to a collection of weights.
 
 use super::Error;
-use crate::{uniform::SampleUniform, Distribution, Uniform};
+use crate::{Distribution, Uniform, uniform::SampleUniform};
 use alloc::{boxed::Box, vec, vec::Vec};
 use core::fmt;
 use core::iter::Sum;
diff --git a/src/weighted/weighted_tree.rs b/src/weighted/weighted_tree.rs
@@ -14,8 +14,8 @@ use core::ops::SubAssign;
 use super::{Error, Weight};
 use crate::Distribution;
 use alloc::vec::Vec;
-use rand::distr::uniform::{SampleBorrow, SampleUniform};
 use rand::Rng;
+use rand::distr::uniform::{SampleBorrow, SampleUniform};
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
@@ -156,13 +156,12 @@ impl<W: Clone + PartialEq + PartialOrd + SampleUniform + SubAssign<W> + Weight>
 
     /// Removes the last weight and returns it, or [`None`] if it is empty.
     pub fn pop(&mut self) -> Option<W> {
-        self.subtotals.pop().map(|weight| {
+        self.subtotals.pop().inspect(|weight| {
             let mut index = self.len();
             while index != 0 {
                 index = (index - 1) / 2;
                 self.subtotals[index] -= weight.clone();
             }
-            weight
         })
     }
 
diff --git a/src/zeta.rs b/src/zeta.rs
@@ -11,7 +11,7 @@
 use crate::{Distribution, StandardUniform};
 use core::fmt;
 use num_traits::Float;
-use rand::{distr::OpenClosed01, Rng};
+use rand::{Rng, distr::OpenClosed01};
 
 /// The [Zeta distribution](https://en.wikipedia.org/wiki/Zeta_distribution) `Zeta(s)`.
 ///
