sim-rs: update rust edition

Author: SupernaviX

sim-rs/sim-cli/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "sim-cli"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 default-run = "sim-cli"
 rust-version = "1.88"
 

sim-rs/sim-cli/src/bin/gen-test-data/main.rs

@@ -4,8 +4,8 @@ use anyhow::Result;
 use clap::{Parser, Subcommand};
 use sim_core::config::Topology;
 use strategy::{
-    globe, organic, random_graph, simplified, GlobeArgs, OrganicArgs, RandomGraphArgs,
-    SimplifiedArgs,
+    GlobeArgs, OrganicArgs, RandomGraphArgs, SimplifiedArgs, globe, organic, random_graph,
+    simplified,
 };
 
 mod strategy;

sim-rs/sim-cli/src/bin/gen-test-data/strategy/globe.rs

@@ -3,12 +3,12 @@ use std::{
     path::PathBuf,
 };
 
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use clap::Parser;
-use rand::{seq::IndexedRandom as _, Rng as _};
+use rand::{Rng as _, seq::IndexedRandom as _};
 use serde::Deserialize;
 
-use crate::strategy::utils::{distribute_stake, GraphBuilder, RawNodeConfig, Weight};
+use crate::strategy::utils::{GraphBuilder, RawNodeConfig, Weight, distribute_stake};
 
 #[derive(Debug, Parser)]
 pub struct GlobeArgs {
@@ -173,7 +173,7 @@ fn track_connections(connected: &mut BTreeSet<usize>, graph: &GraphBuilder, from
 mod tests {
     use sim_core::config::Topology;
 
-    use super::{globe, GlobeArgs};
+    use super::{GlobeArgs, globe};
 
     #[test]
     fn should_generate_valid_graph() {

sim-rs/sim-cli/src/bin/gen-test-data/strategy/organic.rs

@@ -1,12 +1,12 @@
 use std::time::Duration;
 
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use clap::Parser;
-use rand::{seq::SliceRandom, Rng};
+use rand::{Rng, seq::SliceRandom};
 
 use crate::strategy::utils::GraphBuilder;
 
-use super::utils::{distribute_stake, RawNodeConfig, Weight};
+use super::utils::{RawNodeConfig, Weight, distribute_stake};
 
 #[derive(Debug, Parser)]
 pub struct OrganicArgs {
@@ -160,7 +160,7 @@ fn nearby<R: Rng>(rng: &mut R, location: (f64, f64), dist: f64) -> (f64, f64) {
 mod tests {
     use sim_core::config::Topology;
 
-    use super::{organic, OrganicArgs};
+    use super::{OrganicArgs, organic};
 
     #[test]
     fn should_generate_valid_graph() {

sim-rs/sim-cli/src/bin/gen-test-data/strategy/random_graph.rs

@@ -1,10 +1,10 @@
 use std::collections::BTreeSet;
 
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use clap::Parser;
-use rand::{seq::IndexedRandom as _, Rng as _};
+use rand::{Rng as _, seq::IndexedRandom as _};
 
-use crate::strategy::utils::{distribute_stake, GraphBuilder, RawNodeConfig, Weight};
+use crate::strategy::utils::{GraphBuilder, RawNodeConfig, Weight, distribute_stake};
 
 #[derive(Debug, Parser)]
 pub struct RandomGraphArgs {
@@ -100,7 +100,7 @@ fn track_connections(connected: &mut BTreeSet<usize>, graph: &GraphBuilder, from
 mod tests {
     use sim_core::config::Topology;
 
-    use super::{random_graph, RandomGraphArgs};
+    use super::{RandomGraphArgs, random_graph};
 
     #[test]
     fn should_generate_valid_graph() {

sim-rs/sim-cli/src/bin/gen-test-data/strategy/simplified.rs

@@ -2,9 +2,9 @@ use std::time::Duration;
 
 use anyhow::Result;
 use clap::Parser;
-use rand::{rngs::ThreadRng, Rng};
+use rand::{Rng, rngs::ThreadRng};
 
-use super::utils::{distribute_stake, GraphBuilder, RawNodeConfig};
+use super::utils::{GraphBuilder, RawNodeConfig, distribute_stake};
 
 #[derive(Debug, Parser)]
 pub struct SimplifiedArgs {
@@ -129,7 +129,7 @@ pub fn simplified(args: &SimplifiedArgs) -> Result<GraphBuilder> {
 mod tests {
     use sim_core::config::Topology;
 
-    use super::{simplified, SimplifiedArgs};
+    use super::{SimplifiedArgs, simplified};
 
     #[test]
     fn should_generate_valid_graph() {

sim-rs/sim-cli/src/bin/gen-test-data/strategy/utils.rs

@@ -3,7 +3,7 @@ use std::{
     time::Duration,
 };
 
-use netsim_core::geo::{latency_between_locations, Location};
+use netsim_core::geo::{Location, latency_between_locations};
 use rand::Rng;
 use sim_core::config::{RawLinkInfo, RawNode, RawNodeLocation, RawTopology};
 use statrs::distribution::{Beta, ContinuousCDF as _};

sim-rs/sim-cli/src/events.rs

@@ -6,7 +6,7 @@ use async_compression::tokio::write::GzipEncoder;
 use average::Variance;
 use itertools::Itertools as _;
 use liveness::LivenessMonitor;
-use pretty_bytes_rust::{pretty_bytes, PrettyBytesOptions};
+use pretty_bytes_rust::{PrettyBytesOptions, pretty_bytes};
 use serde::Serialize;
 use sim_core::{
     clock::Timestamp,

sim-rs/sim-cli/src/main.rs

@@ -4,8 +4,8 @@ use anyhow::Result;
 use clap::Parser;
 use events::EventMonitor;
 use figment::{
-    providers::{Format as _, Yaml},
     Figment,
+    providers::{Format as _, Yaml},
 };
 use sim_core::{
     clock::ClockCoordinator,
@@ -19,7 +19,7 @@ use tokio::{
 };
 use tokio_util::sync::CancellationToken;
 use tracing::{level_filters::LevelFilter, warn};
-use tracing_subscriber::{layer::SubscriberExt as _, util::SubscriberInitExt, EnvFilter};
+use tracing_subscriber::{EnvFilter, layer::SubscriberExt as _, util::SubscriberInitExt};
 
 mod events;
 
@@ -126,11 +126,14 @@ async fn main() -> Result<()> {
     let ctrlc_token = token.clone();
     ctrlc::set_handler(move || {
         ctrlc_token.cancel();
-        if let Some(sink) = ctrlc_sink.take() {
-            let _ = sink.send(());
-        } else {
-            warn!("force quitting");
-            process::exit(0);
+        match ctrlc_sink.take() {
+            Some(sink) => {
+                let _ = sink.send(());
+            }
+            _ => {
+                warn!("force quitting");
+                process::exit(0);
+            }
         }
     })?;
 
@@ -162,7 +165,7 @@ mod tests {
     use anyhow::Result;
     use std::fs;
 
-    use crate::{read_config, Args};
+    use crate::{Args, read_config};
 
     #[test]
     fn should_parse_topologies() -> Result<()> {

sim-rs/sim-core/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "sim-core"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 rust-version = "1.88"
 
 [dependencies]