use stable rust toolchainstable-rust

2 files changed, 14 insertions, 8 deletions

diff --git a/server/src/network/mdns.rs b/server/src/network/mdns.rs
index 590ad656..b15a197a 100644
--- a/server/src/network/mdns.rs
+++ b/server/src/network/mdns.rs
@@ -21,7 +21,8 @@ use get_if_addrs::get_if_addrs;
 use hurrycurry_protocol::VERSION;
 use log::{info, warn};
 use mdns_sd::{ServiceDaemon, ServiceInfo};
-use std::{collections::HashMap, net::SocketAddr, random::random, sync::Arc, time::Duration};
+use rand::random;
+use std::{collections::HashMap, net::SocketAddr, sync::Arc, time::Duration};
 use tokio::{sync::RwLock, time::interval};
 
 pub async fn mdns_loop(name: String, listen_addr: SocketAddr, state: Arc<RwLock<Server>>) {
@@ -33,7 +34,7 @@ pub async fn mdns_loop(name: String, listen_addr: SocketAddr, state: Arc<RwLock<
         }
     };
     let mut interval = interval(Duration::from_secs(60));
-    let hostname = format!("hurrycurry-{}.local.", random::<u64>(..)); // TODO use system hostname
+    let hostname = format!("hurrycurry-{}.local.", random::<u64>()); // TODO use system hostname
     loop {
         interval.tick().await;
         if let Err(e) = update_service(&d, &state, &name, &hostname, listen_addr).await {
diff --git a/server/src/network/register.rs b/server/src/network/register.rs
index 060994fe..101d96d1 100644
--- a/server/src/network/register.rs
+++ b/server/src/network/register.rs
@@ -19,10 +19,10 @@ use crate::server::Server;
 use anyhow::{Result, bail};
 use hurrycurry_protocol::{VERSION, registry::Submission};
 use log::{debug, error, info, warn};
+use rand::random;
 use reqwest::{Client, Url, header::USER_AGENT};
 use std::{
     net::{IpAddr, Ipv4Addr, Ipv6Addr},
-    random::random,
     str::FromStr,
     sync::Arc,
     time::Duration,
@@ -57,7 +57,7 @@ impl Register {
             registry_uri,
             players: 0,
             port,
-            secret: random(..),
+            secret: random(),
             state,
             ip4_client: if no4 {
                 None
@@ -108,7 +108,6 @@ impl Register {
                 None
             }
         });
-        #[rustfmt::skip]
         match tokio::join!(v4, v6) {
             (None, None) => info!("no registration sent"),
             (Some(Ok(())), None) => info!("Registration successful (IPv4)"),
@@ -116,9 +115,15 @@ impl Register {
             (Some(Ok(())), Some(Ok(()))) => info!("Registration successful (IPv4 + IPv6)"),
             (Some(Err(e)), None) => error!("Registration failed (IPv4): {e}"),
             (None, Some(Err(e))) => error!("Registration failed (IPv6): {e}"),
-            (Some(Err(e1)), Some(Err(e2))) => error!("Registration failed (IPv4 + IPv6): {e1}, {e2}"),
-            (Some(Ok(())), Some(Err(e))) => warn!("Registration partially failed (IPv4 ok, IPv6 fail): {e}"),
-            (Some(Err(e)), Some(Ok(()))) => warn!("Registration partially failed (IPv4 fail, IPv6 ok): {e}"),
+            (Some(Err(e1)), Some(Err(e2))) => {
+                error!("Registration failed (IPv4 + IPv6): {e1}, {e2}")
+            }
+            (Some(Ok(())), Some(Err(e))) => {
+                warn!("Registration partially failed (IPv4 ok, IPv6 fail): {e}")
+            }
+            (Some(Err(e)), Some(Ok(()))) => {
+                warn!("Registration partially failed (IPv4 fail, IPv6 ok): {e}")
+            }
         }
         Ok(())
     }