Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 3 additions & 18 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion fbw-a32nx/src/wasm/systems/guidelines.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ When reading and writing `uom` types using `SimulatorReader` and `SimulatorWrite

## HashMap and HashSet

Prefer using `fxhash::{FxHashMap, FxHashSet}` over using `std::collections::{HashMap, HashSet}`.
Prefer using `rustc_hash::{FxHashMap, FxHashSet}` over using `std::collections::{HashMap, HashSet}`.

**Rationale**: These use a significantly faster hasher.

Expand Down
2 changes: 1 addition & 1 deletion fbw-a380x/src/wasm/systems/a380_systems/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2021"
[dependencies]
uom.workspace = true
nalgebra = "0.33.0"
fxhash = "0.2.1"
rustc-hash = "2.1.1"
rand.workspace = true
serde = { version = "1.0.215", features = ["derive"] }
serde_with = { version = "3.11.0" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1192,8 +1192,8 @@ impl SimulationElement for A380PressurizationOverheadPanel {
mod tests {
use self::local_controllers::outflow_valve_control_module::CpcsShared;
use super::*;
use fxhash::FxHashMap;
use ntest::assert_about_eq;
use rustc_hash::FxHashMap;
use systems::{
air_conditioning::{Channel, PackFlow},
electrical::{test::TestElectricitySource, ElectricalBus, Electricity},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use crate::systems::{
VariableIdentifier, Write,
},
};
use fxhash::FxHashMap;
use rustc_hash::FxHashMap;
use std::{
cell::{Ref, RefCell},
collections::VecDeque,
Expand Down
2 changes: 1 addition & 1 deletion fbw-a380x/src/wasm/systems/guidelines.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ When reading and writing `uom` types using `SimulatorReader` and `SimulatorWrite

## HashMap and HashSet

Prefer using `fxhash::{FxHashMap, FxHashSet}` over using `std::collections::{HashMap, HashSet}`.
Prefer using `rustc_hash::{FxHashMap, FxHashSet}` over using `std::collections::{HashMap, HashSet}`.

**Rationale**: These use a significantly faster hasher.

Expand Down
2 changes: 1 addition & 1 deletion fbw-common/src/wasm/systems/guidelines.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ When reading and writing `uom` types using `SimulatorReader` and `SimulatorWrite

## HashMap and HashSet

Prefer using `fxhash::{FxHashMap, FxHashSet}` over using `std::collections::{HashMap, HashSet}`.
Prefer using `rustc_hash::{FxHashMap, FxHashSet}` over using `std::collections::{HashMap, HashSet}`.

**Rationale**: These use a significantly faster hasher.

Expand Down
2 changes: 1 addition & 1 deletion fbw-common/src/wasm/systems/systems/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ num-derive = "0.4.2"
num-traits = "0.2.19"
nalgebra = "0.33.0"
bounded-vec-deque = "0.1.1"
fxhash = "0.2.1"
rustc-hash = "2.1.1"
bitflags = "2.9.1"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion fbw-common/src/wasm/systems/systems/src/electrical/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ pub use engine_generator::{
INTEGRATED_DRIVE_GENERATOR_STABILIZATION_TIME,
};
pub use external_power_source::ExternalPowerSource;
use fxhash::{FxHashMap, FxHashSet};
use rustc_hash::{FxHashMap, FxHashSet};
pub use static_inverter::StaticInverter;
pub use transformer_rectifier::TransformerRectifier;
use uom::si::{electric_potential::volt, f64::*, power::watt, velocity::knot};
Expand Down
2 changes: 1 addition & 1 deletion fbw-common/src/wasm/systems/systems/src/failures/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use crate::shared::{
FireDetectionZone, GearActuatorId, HydraulicColor, LgciuId, ProximityDetectorId,
};
use crate::simulation::SimulationElement;
use fxhash::FxHashSet;
use rustc_hash::FxHashSet;

#[derive(Clone, Copy, PartialEq, Eq, Hash)]
pub enum FailureType {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use crate::{
SimulatorWriter, VariableIdentifier, Write,
},
};
use fxhash::FxHashMap;
use rustc_hash::FxHashMap;
use std::{cell::RefCell, rc::Rc};

enum PowerSupply {
Expand Down
4 changes: 2 additions & 2 deletions fbw-common/src/wasm/systems/systems/src/simulation/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use crate::{
shared::arinc825::{from_arinc825, to_arinc825, Arinc825Word},
shared::{to_bool, ConsumePower, ElectricalBuses, MachNumber, PowerConsumptionReport},
};
use fxhash::FxHashSet;
use rustc_hash::FxHashSet;
use uom::si::mass_rate::kilogram_per_second;
use uom::si::{
acceleration::foot_per_second_squared, angle::degree, angular_velocity::revolution_per_minute,
Expand Down Expand Up @@ -850,8 +850,8 @@ mod tests {

mod start_state {
use super::*;
use fxhash::FxHashMap;
use ntest::assert_about_eq;
use rustc_hash::FxHashMap;

#[rstest]
#[case(1., StartState::Hangar)]
Expand Down
2 changes: 1 addition & 1 deletion fbw-common/src/wasm/systems/systems/src/simulation/test.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use fxhash::{FxHashMap, FxHashSet};
use rand::Rng;
use rustc_hash::{FxHashMap, FxHashSet};
use std::{cell::Ref, time::Duration};
use uom::si::{
acceleration::foot_per_second_squared,
Expand Down
2 changes: 1 addition & 1 deletion fbw-common/src/wasm/systems/systems_wasm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ test = false
uom.workspace = true
systems = { path = "../systems" }
msfs = { git = "https://github.com/flybywiresim/msfs-rs", branch = "main" }
fxhash = "0.2.1"
rustc-hash = "2.1.1"
enum_dispatch = "0.3.7"
serde = "1.0"
serde_json = "1.0"
2 changes: 1 addition & 1 deletion fbw-common/src/wasm/systems/systems_wasm/src/failures.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use fxhash::{FxHashMap, FxHashSet};
use rustc_hash::{FxHashMap, FxHashSet};
use serde::de::{Deserializer, SeqAccess, Visitor};
use systems::failures::FailureType;

Expand Down
2 changes: 1 addition & 1 deletion fbw-common/src/wasm/systems/systems_wasm/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ use ::msfs::{
sys, MSFSEvent,
};
use failures::Failures;
use fxhash::FxHashMap;
use rustc_hash::FxHashMap;
use std::cell::RefCell;
use std::fmt::{Display, Formatter};
use std::rc::Rc;
Expand Down