Skip to content

Commit ec5de9a

Browse files
authored
Merge pull request #7 from gcavelier/cargo.toml
Merge PR #7: Rust Edition 2024 + let-chains
2 parents 4cbbf90 + 474db57 commit ec5de9a

2 files changed

Lines changed: 17 additions & 17 deletions

File tree

‎Cargo.toml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "naolametric"
33
version = "0.1.0"
4-
edition = "2021"
4+
edition = "2024"
55
description = "LaMetric Time app for Naolib (Nantes public transport) real-time arrivals"
66

77
[dependencies]
@@ -24,6 +24,3 @@ lto = "fat" # Link-Time Optimization maximale
2424
codegen-units = 1 # Meilleure optimisation
2525
panic = "abort" # Pas de unwinding
2626
strip = true # Supprime symboles
27-
28-
[profile.release.build-override]
29-
opt-level = "z"

‎src/main.rs‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,10 @@ fn cache_valide() -> bool {
102102
}
103103

104104
fn assurer_cache_frais() {
105-
if !cache_valide() {
106-
if let Err(e) = rafraichir_cache() {
107-
eprintln!("[WARN] Échec rafraîchissement cache : {e}");
108-
}
105+
if !cache_valide()
106+
&& let Err(e) = rafraichir_cache()
107+
{
108+
eprintln!("[WARN] Échec rafraîchissement cache : {}", e);
109109
}
110110
}
111111

@@ -290,10 +290,11 @@ fn handle_principal(params: &Params) -> (u16, String) {
290290
return (400, ReponseLaMetric::erreur("Bad stop"));
291291
}
292292

293-
if let Some(dir) = params.direction {
294-
if dir != 1 && dir != 2 {
295-
return (400, ReponseLaMetric::erreur("Bad dir"));
296-
}
293+
if let Some(dir) = params.direction
294+
&& dir != 1
295+
&& dir != 2
296+
{
297+
return (400, ReponseLaMetric::erreur("Bad dir"));
297298
}
298299

299300
match recuperer_passages(code_arret) {
@@ -323,10 +324,11 @@ fn handle_stops(params: &Params) -> (u16, String) {
323324

324325
let mut count = 0;
325326
for (code, libelle) in &cache.liste {
326-
if let Some(ref search) = params.search {
327-
if !libelle.to_lowercase().contains(search) && !code.to_lowercase().contains(search) {
328-
continue;
329-
}
327+
if let Some(ref search) = params.search
328+
&& !libelle.to_lowercase().contains(search)
329+
&& !code.to_lowercase().contains(search)
330+
{
331+
continue;
330332
}
331333

332334
if count > 0 {
@@ -363,7 +365,8 @@ fn main() {
363365
let key = key.trim();
364366
let value = value.trim().trim_matches('"');
365367
if !key.is_empty() && !key.starts_with('#') {
366-
env::set_var(key, value);
368+
// SAFETY: Un seul thread en cours d'exécution ici
369+
unsafe { env::set_var(key, value) };
367370
}
368371
}
369372
}

0 commit comments

Comments
 (0)