bump msrv to 1.85 and upgrade to 2024 edition

.github/workflows/ci.yml

@@ -232,7 +232,7 @@ jobs:
         with:
           python-version: "3.14"
       - name: Install Rust
-        uses: dtolnay/rust-toolchain@1.83
+        uses: dtolnay/rust-toolchain@1.85
       - uses: Swatinem/rust-cache@v2
         with:
           workspaces: examples/simple

Cargo.toml

@@ -7,8 +7,8 @@ authors = [
 ]
 description = "PyO3-based Rust bindings of the NumPy C-API"
 documentation = "https://docs.rs/numpy"
-edition = "2021"
-rust-version = "1.83"
+edition = "2024"
+rust-version = "1.85"
 repository = "https://github.com/PyO3/rust-numpy"
 categories = ["api-bindings", "development-tools::ffi", "science"]
 keywords = ["python", "numpy", "ffi", "pyo3"]
@@ -58,7 +58,7 @@ all-features = true
 
 [lints.rust]
 # We usually want to make the GIL lifetime explicit.
-elided-lifetimes-in-paths = "deny"
+elided_lifetimes_in_paths = "deny"
 
 [lints.clippy]
-needless-lifetimes = "allow"
+needless_lifetimes = "allow"

benches/array.rs

@@ -1,8 +1,8 @@
 use std::{hint::black_box, ops::Range};
 
-use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion, Throughput};
+use criterion::{BenchmarkId, Criterion, Throughput, criterion_group, criterion_main};
 use numpy::{PyArray1, PyArray2, PyArray3};
-use pyo3::{types::PyAnyMethods, Bound, IntoPyObjectExt, Python};
+use pyo3::{Bound, IntoPyObjectExt, Python, types::PyAnyMethods};
 
 fn extract_success(c: &mut Criterion) {
     Python::attach(|py| {

benches/array_like.rs

@@ -1,10 +1,10 @@
 use std::hint::black_box;
 
-use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion, Throughput};
+use criterion::{BenchmarkId, Criterion, Throughput, criterion_group, criterion_main};
 use numpy::{PyArrayLike1, PyArrayLike2, PyArrayLike3};
 use pyo3::{
-    types::{PyAnyMethods, PyDict},
     Python,
+    types::{PyAnyMethods, PyDict},
 };
 
 fn extract_array_like_1(c: &mut Criterion) {

benches/borrow.rs

@@ -1,6 +1,6 @@
 use std::hint::black_box;
 
-use criterion::{criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, criterion_group, criterion_main};
 use numpy::{PyArray, PyArrayMethods};
 use pyo3::Python;
 

examples/linalg/Cargo.toml

@@ -2,7 +2,7 @@
 name = "rust-linalg"
 version = "0.1.0"
 authors = ["Yuji Kanagawa <yuji.kngw.80s.revive@gmail.com>"]
-edition = "2021"
+edition = "2024"
 
 [lib]
 crate-type = ["cdylib"]

examples/linalg/src/lib.rs

@@ -2,7 +2,7 @@
 mod rust_linalg {
     use ndarray_linalg::solve::Inverse;
     use numpy::{IntoPyArray, PyArray2, PyReadonlyArray2};
-    use pyo3::{exceptions::PyRuntimeError, pyfunction, Bound, PyResult, Python};
+    use pyo3::{Bound, PyResult, Python, exceptions::PyRuntimeError, pyfunction};
 
     #[pyfunction]
     fn inv<'py>(

examples/parallel/Cargo.toml

@@ -2,7 +2,7 @@
 name = "rust-parallel"
 version = "0.1.0"
 authors = ["Yuji Kanagawa <yuji.kngw.80s.revive@gmail.com>"]
-edition = "2021"
+edition = "2024"
 
 [lib]
 crate-type = ["cdylib"]

examples/parallel/src/lib.rs

@@ -5,7 +5,7 @@ extern crate blas_src;
 mod rust_parallel {
     use numpy::ndarray::Zip;
     use numpy::{IntoPyArray, PyArray1, PyReadonlyArray1, PyReadonlyArray2};
-    use pyo3::{pyfunction, Bound, Python};
+    use pyo3::{Bound, Python, pyfunction};
 
     #[pyfunction]
     fn rows_dot<'py>(

examples/simple/Cargo.toml

@@ -2,7 +2,7 @@
 name = "rust-ext"
 version = "0.1.0"
 authors = ["Toshiki Teramura <toshiki.teramura@gmail.com>", "Yuji Kanagawa <yuji.kngw.80s.revive@gmail.com>"]
-edition = "2021"
+edition = "2024"
 
 [lib]
 crate-type = ["cdylib"]

examples/simple/src/lib.rs

@@ -2,15 +2,15 @@
 mod rust_ext {
     use numpy::ndarray::{Array1, ArrayD, ArrayView1, ArrayViewD, ArrayViewMutD, Zip};
     use numpy::{
-        datetime::{units, Timedelta},
         Complex64, IntoPyArray, PyArray1, PyArrayDyn, PyArrayMethods, PyReadonlyArray1,
         PyReadonlyArrayDyn, PyReadwriteArray1, PyReadwriteArrayDyn,
+        datetime::{Timedelta, units},
     };
     use pyo3::{
+        Bound, FromPyObject, Py, PyAny, PyResult, Python,
         exceptions::PyIndexError,
         pyfunction,
         types::{PyDict, PyDictMethods},
-        Bound, FromPyObject, Py, PyAny, PyResult, Python,
     };
     use std::ops::Add;