Update to 2024 edition

Cargo.toml

@@ -2,7 +2,7 @@
 name = "relp"
 version = "0.2.6"
 authors = ["Bram van den Heuvel <[email protected]>"]
-edition = "2021"
+edition = "2024"
 description = "Rust Exact Linear Programming"
 repository = "https://github.com/vandenheuvel/relp"
 license = "GPL-3.0-only"

src/algorithm/two_phase/tableau/inverse_maintenance/carry/lower_upper/eta_file.rs

@@ -52,12 +52,12 @@ where
 
         let pivot_index = vector.binary_search_by_key(&self.pivot, |&(i, _)| i);
         if let Ok(pivot_index) = pivot_index {
-            for &(j, ref value) in &self.values {
-                let has_index = vector.binary_search_by_key(&j, |&(jj, _)| jj);
+            for (j, value) in &self.values {
+                let has_index = vector.binary_search_by_key(j, |&(jj, _)| jj);
 
                 // TODO(PERFORMANCE): Sort once at the end instead of inserting all the time.
                 let difference = value * &vector[pivot_index].1;
-                update_value(difference, has_index, j, vector);
+                update_value(difference, has_index, *j, vector);
             }
 
             debug_assert!(vector.windows(2).all(|w| w[0].0 < w[1].0));
@@ -120,10 +120,9 @@ where
         };
 
         let difference = self.values.iter()
-            .filter_map(|&(j, ref value)| {
-                let row = j;
+            .filter_map(|(row, value)| {
                 spike[search_index..]
-                    .binary_search_by_key(&row, |&(i, _)| i)
+                    .binary_search_by_key(row, |&(i, _)| i)
                     .ok()
                     .map(|shift| {
                         value * &spike[search_index + shift].1

src/data/linear_program/general_form/mod.rs

@@ -526,9 +526,9 @@ where
             };
 
             // Shift such that any lower bound is zero.
-            if let Some(ref mut lower) = variable.lower_bound {
+            if let Some(lower) = &mut variable.lower_bound {
                 variable.shift -= &*lower;
-                if let Some(ref mut upper) = variable.upper_bound {
+                if let Some(upper) = &mut variable.upper_bound {
                     *upper -= &*lower;
                 }
 
@@ -597,7 +597,7 @@ where
 
         self.constraints.change_row_signs(&rows_to_negate);
         for row in rows_to_negate {
-            match self.constraint_types[row] {
+            match &self.constraint_types[row] {
                 RangedConstraintRelation::Less => {
                     self.constraint_types[row] = RangedConstraintRelation::Greater;
                     self.b[row] *= -OF::one();
@@ -609,7 +609,7 @@ where
                     self.constraint_types[row] = RangedConstraintRelation::Less;
                     self.b[row] *= -OF::one();
                 },
-                RangedConstraintRelation::Range(ref range) => {
+                RangedConstraintRelation::Range(range) => {
                     let minus_old_lower_bound = range - &self.b[row];
                     self.b[row] = minus_old_lower_bound;
                 },
@@ -918,7 +918,7 @@ where
                     (Some(positive), Some(negative)) => positive - negative,
                 }
             },
-            OriginalVariable::Removed(Solved(ref v)) => v.clone().into(),
+            OriginalVariable::Removed(Solved(v)) => v.clone().into(),
             OriginalVariable::Removed(FunctionOfOthers { constant, coefficients }) => {
                 -coefficients.iter()
                     .map(|(j, coefficient)| {

src/data/linear_program/general_form/presolve/mod.rs

@@ -229,7 +229,7 @@ where
             }
 
             let bound_to_edit = direction * coefficient.non_zero_signum();
-            if let Some(ref mut bound) = match bound_to_edit {
+            if let Some(bound) = match bound_to_edit {
                 BoundDirection::Lower => &mut self.activity_bounds[row].0,
                 BoundDirection::Upper => &mut self.activity_bounds[row].1,
             } {

src/data/linear_program/general_form/presolve/updates.rs

@@ -427,9 +427,8 @@ where
         }
 
         // Remove changes that are not actually changes (might have been changed back and forth)
-        let existing_b = &self.general_form.b;
         let b = self.b.into_iter()
-            .filter(|&(i, ref new_b)| new_b != &existing_b[i])
+            .filter(|(i, new_b)| new_b != &self.general_form.b[*i])
             .collect();
 
         let existing_constraint_types = &self.general_form.constraint_types;

src/io/error.rs

@@ -90,7 +90,7 @@ impl Error for Parse {
     ///
     /// Option<&Error> which may be a `ParseErrorCause`.
     fn source(&self) -> Option<&(dyn Error + 'static)> {
-        if let Some(Source::Other(ref error)) = self.source {
+        if let Some(Source::Other(error)) = &self.source {
             Some(error.as_ref())
         } else { None }
     }
@@ -167,7 +167,7 @@ impl Parse {
 
     /// Get all errors in the chain, leading up to this one.
     fn trace(&self) -> Vec<String> {
-        let mut descriptions = if let Some(ref source) = self.source {
+        let mut descriptions = if let Some(source) = &self.source {
             match source {
                 Source::FileLocation(line_number, line) => {
                     vec![format!("Caused at line {}: \t{}", line_number, line)]

src/io/mps/convert.rs

@@ -272,7 +272,7 @@ fn replace_existing_with<OF: Ord>(option: &mut Option<OF>, new_value: OF, orderi
     // Nothing would change if they would need to be equal, so this doesn't make sense.
     debug_assert_ne!(ordering, Ordering::Equal);
 
-    if let Some(ref mut existing_value) = option {
+    if let Some(existing_value) = option {
         if new_value.cmp(existing_value) == ordering {
             *existing_value = new_value;
         }