Merge branch 'main' into clippy-ci

Author: willstott101

.github/workflows/zeroconf_test.yaml

@@ -4,25 +4,26 @@ on: [push, pull_request]
 
 jobs:
   build:
+
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v1
+    - uses: actions/checkout@v1
 
-      - name: Install our MSRV
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          toolchain: "1.74"
+    - name: Install our MSRV
+      uses: dtolnay/rust-toolchain@stable
+      with:
+         toolchain: "1.74"
 
-      - name: Compile example
-        run: cargo build --example register
+    - name: Compile example
+      run: cargo build --example register
 
-      - name: Install dependencies
-        run: |
-          sudo apt-get -y install python3-setuptools python3-wheel
-          pip3 install --user zeroconf
+    - name: Install dependencies
+      run: |
+        sudo apt-get -y install python3-setuptools python3-wheel
+        pip3 install --user zeroconf
 
-      - name: Test zeroconf
-        run: |
-          timeout 5 cargo run --example register &
-          python3 examples/zeroconf_test.py
+    - name: Test zeroconf
+      run: |
+        timeout 5 cargo run --example register &
+        python3 examples/zeroconf_test.py

Cargo.toml

@@ -11,18 +11,22 @@ rust-version = "1.74"
 
 [dependencies]
 byteorder = "1.5"
-if-addrs = { version = "0.12.0", features = ["link-local"] }
-hostname = "0.4.0"
-log = "0.4"
-multimap = "0.10.0"
-rand = "0.8"
 futures-util = "0.3"
-thiserror = "1.0"
-tokio = { version = "1.0", features = ["sync", "net", "rt"] }
-socket2 = { version = "0.5", features = ["all"] }
+hostname = "0.4"
+if-addrs = { version = "0.14", features = ["link-local"] }
+log = "0.4"
+multimap = { version = "0.10", default-features = false }
+rand = "0.9"
+socket2 = { version = "0.6", features = ["all"] }
+thiserror = "2"
+tokio = { version = "1", default-features = false, features = [
+    "sync",
+    "net",
+    "rt",
+] }
 
 [dev-dependencies]
-env_logger = { version = "0.10.2", default-features = false, features = [
+env_logger = { version = "0.11", default-features = false, features = [
     "color",
     "humantime",
     "auto-color",

src/services.rs

@@ -1,6 +1,6 @@
 use crate::dns_parser::{self, Name, QueryClass, RRData};
 use multimap::MultiMap;
-use rand::{thread_rng, Rng};
+use rand::{rng, Rng};
 use std::collections::HashMap;
 use std::slice;
 use std::sync::{Arc, RwLock};
@@ -48,9 +48,10 @@ impl ServicesInner {
     }
 
     pub fn register(&mut self, svc: ServiceData) -> usize {
-        let mut id = thread_rng().gen::<usize>();
+        let random_usize = || rng().random_range(..=usize::MAX);
+        let mut id = random_usize();
         while self.by_id.contains_key(&id) {
-            id = thread_rng().gen::<usize>();
+            id = random_usize();
         }
 
         self.by_type.insert(svc.typ.clone(), id);