Merge pull request #1207 from CodingThrust/rust-2024-edition

Migrate workspace to Rust 2024 edition

Author: GiggleLiu

Cargo.toml

@@ -10,7 +10,8 @@ members = [
 [package]
 name = "problemreductions"
 version = "0.6.0"
-edition = "2021"
+edition = "2024"
+rust-version = "1.88"
 description = "A library for reducing NP-hard problems"
 license = "MIT"
 repository = "https://github.com/CodingThrust/problem-reductions"

benches/solver_benchmarks.rs

@@ -1,6 +1,6 @@
 //! Benchmarks for the BruteForce solver on various problem types.
 
-use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
+use criterion::{BenchmarkId, Criterion, criterion_group, criterion_main};
 use problemreductions::models::formula::*;
 use problemreductions::models::graph::*;
 use problemreductions::models::misc::*;

examples/detect_isolated_problems.rs

@@ -2,8 +2,8 @@
 //!
 //! Run with: `cargo run --example detect_isolated_problems`
 
-use problemreductions::rules::analysis::check_connectivity;
 use problemreductions::rules::ReductionGraph;
+use problemreductions::rules::analysis::check_connectivity;
 
 fn main() {
     let graph = ReductionGraph::new();

examples/detect_unreachable_from_3sat.rs

@@ -7,8 +7,8 @@
 //!
 //! Run with: `cargo run --example detect_unreachable_from_3sat`
 
-use problemreductions::rules::analysis::{check_reachability_from_3sat, UnreachableReason};
 use problemreductions::rules::ReductionGraph;
+use problemreductions::rules::analysis::{UnreachableReason, check_reachability_from_3sat};
 
 fn main() {
     let graph = ReductionGraph::new();

examples/export_mapping_stages.rs

@@ -9,8 +9,8 @@
 
 use problemreductions::rules::unitdiskmapping::{
     _internal::{
-        create_copylines, mis_overhead_copyline, mis_overhead_copyline_triangular, CopyLine,
-        MappingGrid,
+        CopyLine, MappingGrid, create_copylines, mis_overhead_copyline,
+        mis_overhead_copyline_triangular,
     },
     ksg, triangular,
 };
@@ -110,21 +110,21 @@ fn extract_grid_nodes(grid: &MappingGrid) -> Vec<GridNodeExport> {
     let (rows, cols) = grid.size();
     for r in 0..rows {
         for c in 0..cols {
-            if let Some(cell) = grid.get(r, c) {
-                if !cell.is_empty() {
-                    let state = match cell {
-                        CellState::Occupied { .. } => "O",
-                        CellState::Doubled { .. } => "D",
-                        CellState::Connected { .. } => "C",
-                        CellState::Empty => ".",
-                    };
-                    nodes.push(GridNodeExport {
-                        row: r as i64, // 0-indexed - DO NOT change!
-                        col: c as i64, // 0-indexed - DO NOT change!
-                        weight: cell.weight(),
-                        state: state.to_string(),
-                    });
-                }
+            if let Some(cell) = grid.get(r, c)
+                && !cell.is_empty()
+            {
+                let state = match cell {
+                    CellState::Occupied { .. } => "O",
+                    CellState::Doubled { .. } => "D",
+                    CellState::Connected { .. } => "C",
+                    CellState::Empty => ".",
+                };
+                nodes.push(GridNodeExport {
+                    row: r as i64, // 0-indexed - DO NOT change!
+                    col: c as i64, // 0-indexed - DO NOT change!
+                    weight: cell.weight(),
+                    state: state.to_string(),
+                });
             }
         }
     }
@@ -159,21 +159,20 @@ fn crossat_triangular(
 
 fn get_vertex_order_from_julia(graph_name: &str) -> Option<Vec<usize>> {
     let path = format!("tests/data/{}_triangular_trace.json", graph_name);
-    if let Ok(content) = fs::read_to_string(&path) {
-        if let Ok(data) = serde_json::from_str::<serde_json::Value>(&content) {
-            if let Some(copy_lines) = data["copy_lines"].as_array() {
-                let mut lines: Vec<_> = copy_lines
-                    .iter()
-                    .filter_map(|cl| {
-                        let vertex = cl["vertex"].as_u64()? as usize;
-                        let vslot = cl["vslot"].as_u64()? as usize;
-                        Some((vertex - 1, vslot)) // Convert to 0-indexed
-                    })
-                    .collect();
-                lines.sort_by_key(|(_, vslot)| *vslot);
-                return Some(lines.into_iter().map(|(v, _)| v).collect());
-            }
-        }
+    if let Ok(content) = fs::read_to_string(&path)
+        && let Ok(data) = serde_json::from_str::<serde_json::Value>(&content)
+        && let Some(copy_lines) = data["copy_lines"].as_array()
+    {
+        let mut lines: Vec<_> = copy_lines
+            .iter()
+            .filter_map(|cl| {
+                let vertex = cl["vertex"].as_u64()? as usize;
+                let vslot = cl["vslot"].as_u64()? as usize;
+                Some((vertex - 1, vslot)) // Convert to 0-indexed
+            })
+            .collect();
+        lines.sort_by_key(|(_, vslot)| *vslot);
+        return Some(lines.into_iter().map(|(v, _)| v).collect());
     }
     None
 }

examples/export_petersen_mapping.rs

@@ -28,7 +28,7 @@
 //! - `docs/paper/static/petersen_square_unweighted.json` - Unweighted King's subgraph
 //! - `docs/paper/static/petersen_triangular.json` - Weighted triangular lattice
 
-use problemreductions::rules::unitdiskmapping::{ksg, triangular, MappingResult};
+use problemreductions::rules::unitdiskmapping::{MappingResult, ksg, triangular};
 use serde::Serialize;
 use std::fs;
 use std::path::Path;

examples/export_schemas.rs

@@ -2,7 +2,7 @@
 //!
 //! Run with: `cargo run --example export_schemas [output_path]`
 
-use problemreductions::registry::{collect_schemas, ProblemSchemaEntry};
+use problemreductions::registry::{ProblemSchemaEntry, collect_schemas};
 use std::path::{Path, PathBuf};
 
 pub fn run(output_path: &Path) {

examples/polynomial_compare_audit.rs

@@ -5,7 +5,7 @@
 //! Each endpoint group is one generic batch, including every nonzero field certificate.
 //!
 //! cargo run --release --example polynomial_compare_audit
-use problemreductions::poly_compare::{compare_all, Direction, Profile, Reason, Verdict};
+use problemreductions::poly_compare::{Direction, Profile, Reason, Verdict, compare_all};
 use problemreductions::rules::{ReductionGraph, ReductionPath, ReductionStep};
 use std::collections::BTreeMap;
 use std::time::Instant;

problemreductions-cli/Cargo.toml

@@ -1,7 +1,8 @@
 [package]
 name = "problemreductions-cli"
 version = "0.6.0"
-edition = "2021"
+edition = "2024"
+rust-version = "1.88"
 description = "CLI tool for exploring NP-hard problem reductions"
 license = "MIT"
 repository = "https://github.com/CodingThrust/problem-reductions"

problemreductions-cli/src/bin/pred_sym.rs

@@ -1,5 +1,5 @@
 use clap::{Parser, Subcommand};
-use problemreductions::{big_o_normal_form, evaluate_approximate, Expr, ProblemParameters};
+use problemreductions::{Expr, ProblemParameters, big_o_normal_form, evaluate_approximate};
 
 #[derive(Parser)]
 #[command(