Skip to content

editoast: use 'Borrow' to avoid iteration in 'HashSet' #13940

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 13, 2025
Merged

editoast: use 'Borrow' to avoid iteration in 'HashSet' #13940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfcee6f
editoast: use 'Borrow' to avoid iteration in 'HashSet'
woshilapin Nov 7, 2025
048e628
editoast: use constants for variant's names
woshilapin Nov 12, 2025
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
9 changes: 5 additions & 4 deletions editoast/schemas/src/rolling_stock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,11 @@ impl RollingStock {
}

pub fn get_etcs_brake_params(&self) -> Option<&EtcsBrakeParams> {
for signaling_system in &self.supported_signaling_systems {
if let SupportedSignalingSystem::EtcsLevel2 { brake_params } = signaling_system {
return Some(brake_params);
}
if let Some(SupportedSignalingSystem::EtcsLevel2 { brake_params }) = self
.supported_signaling_systems
.get(SupportedSignalingSystem::ETCS_LEVEL2_VARIANT_NAME)
{
return Some(brake_params);
}
None
}
Expand Down
17 changes: 16 additions & 1 deletion editoast/schemas/src/rolling_stock/supported_signaling_system.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
use std::borrow::Borrow;

use educe::Educe;
use serde::Deserialize;
use serde::Serialize;
Expand All @@ -6,7 +8,7 @@ use utoipa::ToSchema;

use crate::rolling_stock::EtcsBrakeParams;

#[derive(Clone, Debug, Deserialize, Serialize, Display, Educe, ToSchema)]
#[derive(Clone, Debug, Deserialize, Serialize, Display, Educe, ToSchema, strum::IntoStaticStr)]
#[educe(Hash, Eq, PartialEq)]
#[serde(tag = "type")]
#[allow(clippy::large_enum_variant)]
Expand All @@ -15,9 +17,22 @@ pub enum SupportedSignalingSystem {
BAPR,
TVM300,
TVM430,
// /!\ Must be the same value than [SupportedSignalingSystem::ETCS_LEVEL2_VARIANT_NAME]
#[strum(to_string = "ETCS_LEVEL2")]
#[serde(rename = "ETCS_LEVEL2")]
EtcsLevel2 {
brake_params: EtcsBrakeParams,
},
}

impl SupportedSignalingSystem {
// /!\ Must be the same value than the serialization of that variant
// look for `#[serde(rename)]` and `#[strum(to_string)]`
pub const ETCS_LEVEL2_VARIANT_NAME: &str = "ETCS_LEVEL2";
}

impl Borrow<str> for SupportedSignalingSystem {
fn borrow(&self) -> &str {
self.into()
}
}
Loading