Increase Rust edition from 2021 to 2024

Author: cschwan

CHANGELOG.md

@@ -25,6 +25,7 @@ Starting with this version, PineAPPL has an official logo!
 ### Changed
 
 - raised MSRV to 1.94.0
+- raised Rust edition to 2024
 
 ## [1.3.3] - 01/03/2026
 

Cargo.lock

@@ -17,7 +17,7 @@ resolver = "2"
 
 [workspace.package]
 categories = ["science"]
-edition = "2021"
+edition = "2024"
 keywords = ["high-energy-physics", "physics"]
 license = "GPL-3.0-or-later"
 repository = "https://github.com/NNPDF/pineappl"

Cargo.toml

@@ -145,7 +145,7 @@ impl<T: Copy + Default + PartialEq> PackedArray<T> {
 
         for ((i, j, k), &entry) in array
             .indexed_iter()
-            .filter(|(_, &entry)| entry != Default::default())
+            .filter(|&(_, &entry)| entry != Default::default())
         {
             result[[i + xstart, j, k]] = entry;
         }
@@ -161,7 +161,7 @@ impl<T: Copy + Default + PartialEq> From<ArrayViewD<'_, T>> for PackedArray<T> {
         for (i, &entry) in array
             .iter()
             .enumerate()
-            .filter(|(_, &entry)| entry != Default::default())
+            .filter(|&(_, &entry)| entry != Default::default())
         {
             result[i] = entry;
         }

pineappl/src/packed_array.rs

@@ -89,8 +89,8 @@ fn hadronic_pspgen(rng: &mut impl Rng, mmin: f64, mmax: f64) -> Psp2to2 {
 
     let mut jacobian = 1.0;
 
-    let r1 = rng.gen::<f64>();
-    let r2 = rng.gen::<f64>();
+    let r1 = rng.r#gen::<f64>();
+    let r2 = rng.r#gen::<f64>();
     let tau0 = smin / smax;
     let tau = tau0.powf(r1);
     let y = tau.powf(1.0 - r2);
@@ -100,7 +100,7 @@ fn hadronic_pspgen(rng: &mut impl Rng, mmin: f64, mmax: f64) -> Psp2to2 {
     jacobian *= tau * tau0.ln().powi(2) * r1;
 
     // theta integration (in the CMS)
-    let cos_theta = rng.gen::<f64>().mul_add(2.0, -1.0);
+    let cos_theta = rng.r#gen::<f64>().mul_add(2.0, -1.0);
     jacobian *= 2.0;
 
     let t = -0.5 * s * (1.0 - cos_theta);

pineappl/tests/drell_yan_lo.rs

@@ -16,12 +16,12 @@ version.workspace = true
 workspace = true
 
 [dependencies]
-cxx = "1.0.65"
+cxx = "1.0.130"
 lhapdf = { package = "managed-lhapdf", version = "0.3.4" }
 
 [build-dependencies]
 cc = "1.0.49"
-cxx-build = "1.0.65"
+cxx-build = "1.0.130"
 pkg-config = "0.3.26"
 
 [features]