apply cargo fmt, add cargo fmt to linting, consolidate linting and testing envs into test

Author: kylecarow

.github/workflows/shared_build_test.yaml

@@ -4,19 +4,22 @@ on:
   workflow_call:
 
 jobs:
-  # lint:
-  #   name: Lint
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - uses: actions/checkout@v4
-
-  #     - name: Set up Pixi
-  #       uses: prefix-dev/setup-pixi@v0.8.14
-  #       with:
-  #         environments: lint
-
-  #     - name: ruff check .
-  #       run: pixi run -e lint ruff check .
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Pixi
+        uses: prefix-dev/setup-pixi@v0.8.14
+        with:
+          environments: test
+
+      # - name: ruff check .
+      #   run: pixi run -e test ruff check .
+
+      - name: cargo fmt --check
+        run: pixi run -e test cargo fmt --check
 
   build:
     name: Build py3.${{ matrix.python-version }} on ${{ matrix.platform || matrix.os.base }}-${{ matrix.os.version }}

build_and_test.sh

@@ -1,5 +1,6 @@
 python python/fastsim/check_versions.py && \
-# ruff check . && \
+cargo fmt --check && \
 cargo test && \
-pip install --group test --group lint -e . && \
+pip install --group test -e . && \
+# ruff check . && \
 pytest -v

fastsim-core/src/vehicle/powertrain/electric_machine.rs

@@ -562,7 +562,11 @@ impl Mass for ElectricMachine {
                 )
             }
         };
-        ensure!(self.mass > Some(0.0 * uc::KG), "{} mass must be positive", stringify!(ElectricMachine));
+        ensure!(
+            self.mass > Some(0.0 * uc::KG),
+            "{} mass must be positive",
+            stringify!(ElectricMachine)
+        );
         Ok(())
     }
 

fastsim-core/src/vehicle/powertrain/reversible_energy_storage.rs

@@ -792,7 +792,7 @@ impl Mass for ReversibleEnergyStorage {
                     }
                 }
                 Some(new_mass)
-            },
+            }
             (Some(new_mass), None) => Some(new_mass),
             (None, Some(dm)) => Some(dm),
             (None, None) => bail!(

fastsim-core/src/vehicle/powertrain/transmission.rs

@@ -176,7 +176,11 @@ impl Mass for Transmission {
     ) -> anyhow::Result<()> {
         match new_mass {
             Some(_) => {
-                ensure!(new_mass > Some(0.0 * uc::KG), "{} mass must be positive", stringify!(Transmission));
+                ensure!(
+                    new_mass > Some(0.0 * uc::KG),
+                    "{} mass must be positive",
+                    stringify!(Transmission)
+                );
                 self.mass = new_mass;
             }
             None => {

fastsim-core/src/vehicle/vehicle_model.rs

@@ -616,17 +616,15 @@ impl Vehicle {
         //   AWD/4WD: both axles drive, weight transfer doesn't reduce total drive grip
         let cg_height_abs = self.chassis.cg_height.abs();
         let weight_transfer_sign: f64 = match self.chassis.drive_type {
-            chassis::DriveTypes::FWD => 1.0,    // weight shifts away from front drive axle → reduces traction
-            chassis::DriveTypes::RWD => -1.0,   // weight shifts toward rear drive axle → increases traction
-            chassis::DriveTypes::AWD
-            | chassis::DriveTypes::FourWD => 0.0, // net zero effect on total drive traction
+            chassis::DriveTypes::FWD => 1.0, // weight shifts away from front drive axle → reduces traction
+            chassis::DriveTypes::RWD => -1.0, // weight shifts toward rear drive axle → increases traction
+            chassis::DriveTypes::AWD | chassis::DriveTypes::FourWD => 0.0, // net zero effect on total drive traction
         };
-        let max_trac_accel = self.chassis.wheel_fric_coef
-            * self.chassis.drive_axle_weight_frac
-            * uc::ACC_GRAV
-            / (1.0 * uc::R
-                + weight_transfer_sign * cg_height_abs * self.chassis.wheel_fric_coef
-                    / self.chassis.wheel_base);
+        let max_trac_accel =
+            self.chassis.wheel_fric_coef * self.chassis.drive_axle_weight_frac * uc::ACC_GRAV
+                / (1.0 * uc::R
+                    + weight_transfer_sign * cg_height_abs * self.chassis.wheel_fric_coef
+                        / self.chassis.wheel_base);
         let prev_speed = *self.state.speed_ach.get_stale(|| format_dbg!())?;
         let max_trac_speed = prev_speed + (max_trac_accel * dt);
         self.state

fastsim-py/src/lib.rs

@@ -43,7 +43,10 @@ fn fastsim(_py: Python, m: &Bound<PyModule>) -> PyResult<()> {
     // List enabled features
     m.add_function(wrap_pyfunction!(fastsim_core::enabled_features, m)?)?;
 
-    m.add_function(wrap_pyfunction!(fastsim_core::simdrivelabel::get_label_fe_py, m)?)?;
+    m.add_function(wrap_pyfunction!(
+        fastsim_core::simdrivelabel::get_label_fe_py,
+        m
+    )?)?;
 
     Ok(())
 }

pixi.lock

@@ -53,20 +53,17 @@ release = [
 ]
 test = [
     {include-group = "build"},
+    "ruff>=0.11.9",
     "pytest~=8.3",
     "memory_profiler~=0.61.0",
 ]
-lint = [
-    "ruff>=0.11.9",
-]
 docs = [
     "jupyter-book>=2.0.0",
     "nbformat",
 ]
 dev = [
     {include-group = "build"},
     {include-group = "test"},
-    {include-group = "lint"},
     {include-group = "docs"},
     "pylsp-mypy>=0.7.0",
     "pylsp-rope>=0.1.17",
@@ -132,9 +129,8 @@ default = { solve-group = "default" }
 build = { features = ["build"], solve-group = "default" }
 release = { features = ["release", "build"], solve-group = "default" }
 test = { features = ["test", "build"], solve-group = "default" }
-lint = { features = ["lint"], solve-group = "default" }
 docs = { features = ["docs", "build"], solve-group = "default" }
-dev = { features = ["dev", "docs", "build"], solve-group = "default" }
+dev = { features = ["dev", "build", "test", "docs"], solve-group = "default" }
 # Environments for specific Python versions with CI/CD
 # https://devguide.python.org/versions/#status-of-python-versions
 py310 = { features = ["py310", "test"], solve-group = "py310" }
@@ -150,8 +146,8 @@ py_build = "maturin develop --release"
 py_test = { cmd = "pixi run -e test pytest -v", depends-on = ["py_build"] }
 build_and_test = { depends-on = ["cargo_test", "py_test"] }
 fmt = "ruff format"
-lint = "pylint"
-style = { depends-on = ["fmt", "lint"] }
+# lint = "pylint"
+# style = { depends-on = ["fmt", "lint"] }
 
 [tool.ruff]
 # Specify Python version