updated dependencies

.github/workflows/ci.yml

@@ -105,7 +105,7 @@ jobs:
         run: cargo run --example portfolio
 
   msrv:
-    name: Check MSRV (1.71)
+    name: Check MSRV (1.85)
     runs-on: ubuntu-latest
 
     steps:
@@ -115,7 +115,7 @@ jobs:
       - name: Install Rust toolchain
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: "1.71"
+          toolchain: "1.87"
 
       - name: Check build with MSRV
         run: cargo check --all-features

Cargo.toml

@@ -1,33 +1,32 @@
 [package]
 name = "cvxrust"
 version = "0.1.0"
-edition = "2021"
-authors = ["CVXPY team"]
+edition = "2024"
 description = "A Rust implementation of Disciplined Convex Programming"
 license = "Apache-2.0"
 repository = "https://github.com/cvxpy/cvxrust"
 documentation = "https://docs.rs/cvxrust"
 keywords = ["optimization", "convex", "dcp", "solver", "math"]
 categories = ["mathematics", "algorithms", "science"]
-rust-version = "1.71"
+rust-version = "1.87"
 
 [dependencies]
 # Clarabel solver
-clarabel = "0.9"
+clarabel = "0.11"
 
 # Sparse matrices
-nalgebra = "0.33"
-nalgebra-sparse = "0.10"
+nalgebra = "0.34"
+nalgebra-sparse = "0.11"
 
 # Error handling
 thiserror = "2.0"
 
 # Fast hash maps
-rustc-hash = "2.0"
+rustc-hash = "2.1"
 
 [dev-dependencies]
 approx = "0.5"
-rand = "0.8"
+rand = "0.10"
 
 [features]
 default = []

src/atoms/affine.rs

@@ -9,7 +9,7 @@
 use std::ops::{Add, Div, Mul, Neg, Sub};
 use std::sync::Arc;
 
-use crate::expr::{constant, Expr, Shape};
+use crate::expr::{Expr, Shape, constant};
 
 // ============================================================================
 // Operator overloading for Expr

src/atoms/mod.rs

@@ -16,6 +16,6 @@ pub use affine::{
 
 // Re-export nonlinear atoms
 pub use nonlinear::{
-    abs, entropy, exp, log, max2, maximum, min2, minimum, neg_part, norm, norm1, norm2, norm_inf,
+    abs, entropy, exp, log, max2, maximum, min2, minimum, neg_part, norm, norm_inf, norm1, norm2,
     pos, power, quad_form, quad_over_lin, sqrt, sum_squares, try_norm,
 };

src/canon/canonicalizer.rs

@@ -915,7 +915,7 @@ impl CanonContext {
                 let ai = csc_to_dense(&x.coeffs[&var_i]); // (m, ni)
                 for &var_j in &vars {
                     let aj = csc_to_dense(&x.coeffs[&var_j]); // (m, nj)
-                                                              // A_i' * A_j: (ni, m) * (m, nj) = (ni, nj)
+                    // A_i' * A_j: (ni, m) * (m, nj) = (ni, nj)
                     let ai_t_aj = dense_to_csc(&(ai.transpose() * &aj));
                     quad_coeffs
                         .entry((var_i, var_j))

src/canon/mod.rs

@@ -8,5 +8,5 @@
 pub mod canonicalizer;
 pub mod lin_expr;
 
-pub use canonicalizer::{canonicalize, CanonExpr, CanonResult, ConeConstraint};
+pub use canonicalizer::{CanonExpr, CanonResult, ConeConstraint, canonicalize};
 pub use lin_expr::{LinExpr, QuadExpr};

src/dcp/mod.rs

@@ -8,5 +8,5 @@
 pub mod curvature;
 pub mod sign;
 
-pub use curvature::{add_curvature, scalar_mul_curvature, Curvature, PsdStatus};
-pub use sign::{add_sign, mul_sign, Sign};
+pub use curvature::{Curvature, PsdStatus, add_curvature, scalar_mul_curvature};
+pub use sign::{Sign, add_sign, mul_sign};

src/expr/eval.rs

@@ -150,11 +150,7 @@ impl Expr {
             Expr::Exp(a) => Ok(eval_elementwise(a.eval(ctx)?, f64::exp)),
             Expr::Log(a) => Ok(eval_elementwise(a.eval(ctx)?, f64::ln)),
             Expr::Entropy(a) => Ok(eval_elementwise(a.eval(ctx)?, |x| {
-                if x <= 0.0 {
-                    0.0
-                } else {
-                    -x * x.ln()
-                }
+                if x <= 0.0 { 0.0 } else { -x * x.ln() }
             })),
             Expr::Power(a, p) => {
                 let p = *p;
@@ -506,7 +502,7 @@ fn eval_cumsum(a: Array, axis: Option<usize>) -> crate::Result<Array> {
             return Err(crate::CvxError::InvalidProblem(format!(
                 "Invalid axis {} for cumsum",
                 ax
-            )))
+            )));
         }
     }
     Ok(Array::Dense(m))

src/expr/expression.rs

@@ -3,8 +3,8 @@
 //! The `Expr` enum represents all possible expressions in the DCP framework.
 //! Expressions form an immutable DAG (directed acyclic graph) using `Arc` for sharing.
 
-use std::sync::atomic::{AtomicU64, Ordering};
 use std::sync::Arc;
+use std::sync::atomic::{AtomicU64, Ordering};
 
 use nalgebra::DMatrix;
 use nalgebra_sparse::CscMatrix;
@@ -329,7 +329,7 @@ impl Expr {
                 for (i, r) in spec.ranges.iter().enumerate() {
                     match r {
                         Some((start, stop, step)) => {
-                            let size = (stop - start + step - 1) / step;
+                            let size = (stop - start).div_ceil(*step);
                             if size > 1 {
                                 new_dims.push(size);
                             }

src/expr/mod.rs

@@ -14,13 +14,13 @@ pub mod variable;
 
 // Re-export main types
 pub use constant::{
-    constant, constant_dmatrix, constant_matrix, constant_sparse, constant_vec, eye, ones, zeros,
-    IntoConstant,
+    IntoConstant, constant, constant_dmatrix, constant_matrix, constant_sparse, constant_vec, eye,
+    ones, zeros,
 };
 pub use eval::Evaluable;
 pub use expression::{Array, ConstantData, Expr, ExprId, IndexSpec, VariableData};
 pub use shape::Shape;
 pub use variable::{
-    matrix_var, named_variable, nonneg_variable, nonpos_variable, scalar_var, var, variable,
-    vector_var, VariableBuilder, VariableExt,
+    VariableBuilder, VariableExt, matrix_var, named_variable, nonneg_variable, nonpos_variable,
+    scalar_var, var, variable, vector_var,
 };

src/expr/shape.rs

@@ -100,12 +100,10 @@ impl Shape {
         let mut result = Vec::with_capacity(max_ndim);
 
         // Pad shapes with 1s on the left
-        let self_padded: Vec<usize> = std::iter::repeat(1)
-            .take(max_ndim - self.ndim())
+        let self_padded: Vec<usize> = std::iter::repeat_n(1, max_ndim - self.ndim())
             .chain(self.0.iter().copied())
             .collect();
-        let other_padded: Vec<usize> = std::iter::repeat(1)
-            .take(max_ndim - other.ndim())
+        let other_padded: Vec<usize> = std::iter::repeat_n(1, max_ndim - other.ndim())
             .chain(other.0.iter().copied())
             .collect();
 

src/lib.rs

@@ -79,15 +79,15 @@ pub mod sparse;
 pub mod prelude {
     // Expression types
     pub use crate::expr::{
+        Array, Evaluable, Expr, ExprId, IntoConstant, Shape, VariableBuilder, VariableExt,
         constant, constant_dmatrix, constant_matrix, constant_sparse, constant_vec, eye, ones,
-        variable, zeros, Array, Evaluable, Expr, ExprId, IntoConstant, Shape, VariableBuilder,
-        VariableExt,
+        variable, zeros,
     };
 
     // Atoms
     pub use crate::atoms::{
         abs, cumsum, diag, dot, entropy, exp, flatten, hstack, log, matmul, max2, maximum, min2,
-        minimum, neg_part, norm, norm1, norm2, norm_inf, pos, power, quad_form, quad_over_lin,
+        minimum, neg_part, norm, norm_inf, norm1, norm2, pos, power, quad_form, quad_over_lin,
         reshape, sqrt, sum, sum_axis, sum_squares, trace, transpose, try_norm, vstack,
     };
 

src/problem.rs

@@ -13,11 +13,11 @@
 
 use std::sync::Arc;
 
-use crate::canon::{canonicalize, ConeConstraint};
+use crate::canon::{ConeConstraint, canonicalize};
 use crate::constraints::Constraint;
 use crate::error::{CvxError, Result};
 use crate::expr::{Expr, ExprId, Shape};
-use crate::solver::{solve, stuff_problem, Settings, Solution, SolveStatus};
+use crate::solver::{Settings, Solution, SolveStatus, solve, stuff_problem};
 
 /// Objective type for optimization problems.
 #[derive(Debug, Clone)]

src/solver/clarabel.rs

@@ -265,7 +265,8 @@ pub fn solve(problem: &StuffedProblem, settings: &Settings) -> Solution {
         .unwrap();
 
     // Create and run solver
-    let mut solver = DefaultSolver::new(&p, &problem.q, &a, &problem.b, &cones, clarabel_settings);
+    let mut solver = DefaultSolver::new(&p, &problem.q, &a, &problem.b, &cones, clarabel_settings)
+        .expect("Settings to be correct");
     solver.solve();
 
     // Extract solution

src/solver/mod.rs

@@ -7,5 +7,5 @@
 pub mod clarabel;
 pub mod stuffing;
 
-pub use self::clarabel::{solve, Settings, Solution, SolveStatus};
-pub use stuffing::{stuff_problem, ConeDims, StuffedProblem, VariableMap};
+pub use self::clarabel::{Settings, Solution, SolveStatus, solve};
+pub use stuffing::{ConeDims, StuffedProblem, VariableMap, stuff_problem};