chore: update rust version + disable unsupported optimizations (#8242)

* chore: update rust + disable unsupported optimizations * update cargo lock * update dev-env * update lockfile after merge * fix: new clippy * fix: terronnd build for 320
flybywiresim · Nov 3, 2023 · a74a618 · a74a618
1 parent 321216d
commit a74a618
Show file tree

Hide file tree

Showing 21 changed files with 69 additions and 181 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 
 members = [
     "fbw-a32nx/src/wasm/systems/a320_systems",

diff --git a/fbw-a32nx/src/wasm/systems/a320_systems/src/air_conditioning.rs b/fbw-a32nx/src/wasm/systems/a320_systems/src/air_conditioning.rs
@@ -2127,7 +2127,7 @@ mod tests {
 
             test_bed = test_bed.command_ditching_pb_on().iterate(5);
 
-            assert!(!(test_bed.outflow_valve_open_amount() > Ratio::new::<percent>(99.)));
+            assert!(test_bed.outflow_valve_open_amount() <= Ratio::new::<percent>(99.));
             assert!(test_bed.outflow_valve_open_amount() < Ratio::new::<percent>(1.));
         }
 

diff --git a/fbw-a32nx/src/wasm/systems/a320_systems/src/hydraulic/mod.rs b/fbw-a32nx/src/wasm/systems/a320_systems/src/hydraulic/mod.rs
@@ -2986,15 +2986,10 @@ impl A320BlueElectricPumpController {
     ) {
         let mut should_pressurise_if_powered = false;
         if overhead_panel.blue_epump_push_button.is_auto() {
-            if !lgciu1.nose_gear_compressed(false)
+            should_pressurise_if_powered = !lgciu1.nose_gear_compressed(false)
                 || engine1.is_above_minimum_idle()
                 || engine2.is_above_minimum_idle()
-                || overhead_panel.blue_epump_override_push_button_is_on()
-            {
-                should_pressurise_if_powered = true;
-            } else {
-                should_pressurise_if_powered = false;
-            }
+                || overhead_panel.blue_epump_override_push_button_is_on();
         } else if overhead_panel.blue_epump_push_button_is_off() {
             should_pressurise_if_powered = false;
         }
@@ -3075,7 +3070,7 @@ impl A320BlueElectricPumpController {
     }
 
     fn has_overheat_fault(&self) -> bool {
-        self.has_low_level_fault
+        self.has_overheat_fault
     }
 }
 impl PumpController for A320BlueElectricPumpController {