Merge pull request #516 from light-curve/msrv-1.85

MSRV 1.85 and Rust Edition 2024

Author: hombit

CHANGELOG.md

@@ -9,11 +9,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- Mark the module as no-GIL, which enables free-threaded Python (can be built from source, not provided so far via PyPI/conda) https://github.com/light-curve/light-curve-python/pull/499
+- Mark the module as no-GIL, which enables free-threaded Python (can be built from source, not provided so far via
+  PyPI/conda) https://github.com/light-curve/light-curve-python/pull/499
 
 ### Changed
 
-- **PyPI wheels change**: bump Musl PyPI wheels compatibility from musllinux 1.1 to 1.2 https://github.com/light-curve/light-curve-python/pull/503
+- **PyPI wheels change**: bump Musl PyPI wheels compatibility from musllinux 1.1 to
+  1.2 https://github.com/light-curve/light-curve-python/pull/503
+- **Build breaking**: minimum supported Rust version (MSRV) is changed from 1.67 to 1.85
+- We also migrated from Rust edition 2021 to 2025
 - Bump both `PyO3` and `rust-numpy` to v0.24 https://github.com/light-curve/light-curve-python/pull/499
 
 ### Deprecated
@@ -26,7 +30,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-- Fix error messages for invalid inputs https://github.com/light-curve/light-curve-python/issues/505 https://github.com/light-curve/light-curve-python/pull/510
+- Fix error messages for invalid
+  inputs https://github.com/light-curve/light-curve-python/issues/505 https://github.com/light-curve/light-curve-python/pull/510
 
 ### Security
 

light-curve/Cargo.lock

@@ -11,8 +11,8 @@ description = "Feature extractor from noisy time series"
 readme = "README.md"
 repository = "https://github.com/light-curve/light-curve-python"
 license = "GPL-3.0-or-later"
-edition = "2021"
-rust-version = "1.67"
+edition = "2024"
+rust-version = "1.85"
 
 [lib]
 name = "light_curve"
@@ -67,4 +67,4 @@ features = ["serde"]
 
 [dependencies.light-curve-feature]
 version = "0.8.1"
-default_features = false
+default-features = false

light-curve/Cargo.toml

@@ -5,7 +5,7 @@ use crate::np_array::Arr;
 
 use crate::errors::Exception::ValueError;
 use conv::{ApproxFrom, ApproxInto, ConvAsUtil};
-use enumflags2::{bitflags, BitFlags};
+use enumflags2::{BitFlags, bitflags};
 use light_curve_dmdt as lcdmdt;
 use light_curve_dmdt::{Grid, GridTrait};
 use ndarray::IntoNdProducer;
@@ -477,7 +477,7 @@ where
                 _ => {
                     return Err(Exception::ValueError(String::from(
                         "if drop_nobs is float, it must be in [0.0, 1.0)",
-                    )))
+                    )));
                 }
             },
         };
@@ -498,7 +498,7 @@ where
             None => {
                 return Err(Exception::RuntimeError(String::from(
                     "dropping is not required: drop_nobs = 0",
-                )))
+                )));
             }
         };
         let drop_nobs = match drop_nobs {
@@ -945,7 +945,7 @@ impl DmDt {
             _ => {
                 return Err(Exception::ValueError(
                     "dt_type must be 'auto', 'linear', 'log' or 'asis'".to_owned(),
-                ))
+                ));
             }
         };
         let grid_f32: Grid<f32> = match grid_f64 {
@@ -955,7 +955,7 @@ impl DmDt {
             _ => {
                 return Err(Exception::NotImplementedError(
                     "this type of grid is not implemented".into(),
-                ))
+                ));
             }
         };
         Ok((grid_f32, grid_f64))

light-curve/src/dmdt.rs

@@ -1,8 +1,8 @@
+use pyo3::PyErr;
 use pyo3::exceptions::{
     PyIndexError, PyNotImplementedError, PyRuntimeError, PyTypeError, PyValueError,
 };
 use pyo3::import_exception;
-use pyo3::PyErr;
 use std::fmt::Debug;
 use std::result::Result;
 use thiserror::Error;