Clean up some dependencies

Author: jsmnbom

crates/buttplug_client_in_process/Cargo.toml

@@ -48,5 +48,4 @@ log = "0.4.29"
 getset = "0.1.6"
 tokio = { version = "1.49.0", features = ["macros"] }
 dashmap = { version = "6.1.0" }
-tracing-futures = "0.2.5"
 tracing = "0.1.44"

crates/buttplug_server/Cargo.toml

@@ -37,7 +37,6 @@ tracing = "0.1.44"
 serde = { version = "1.0.228", features = ["derive"] }
 serde_json = "1.0.149"
 jsonschema = { version = "0.38.1", default-features = false }
-once_cell = "1.21.3"
 tokio-stream = "0.1.18"
 strum_macros = "0.27.2"
 strum = "0.27.2"

crates/buttplug_server/src/message/serializer/mod.rs

@@ -5,6 +5,8 @@
 // Licensed under the BSD 3-Clause license. See LICENSE file in the project root
 // for full license information.
 
+use std::sync::OnceLock;
+
 use buttplug_core::{
   errors::{ButtplugError, ButtplugHandshakeError, ButtplugMessageError},
   message::{
@@ -28,7 +30,6 @@ use buttplug_core::{
   },
 };
 use jsonschema::Validator;
-use once_cell::sync::OnceCell;
 use serde::Deserialize;
 
 use super::{
@@ -69,14 +70,14 @@ impl ButtplugMessageFinalizer for RequestServerInfoVersion {
 }
 
 pub struct ButtplugServerJSONSerializer {
-  pub(super) message_version: OnceCell<message::ButtplugMessageSpecVersion>,
+  pub(super) message_version: OnceLock<message::ButtplugMessageSpecVersion>,
   validator: Validator,
 }
 
 impl Default for ButtplugServerJSONSerializer {
   fn default() -> Self {
     Self {
-      message_version: OnceCell::new(),
+      message_version: OnceLock::new(),
       validator: create_message_validator(),
     }
   }

crates/buttplug_tests/Cargo.toml

@@ -22,7 +22,6 @@ uuid = "1.20.0"
 futures = "0.3.31"
 tracing = "0.1.44"
 tracing-subscriber = "0.3.22"
-tracing-futures = "0.2.5"
 tokio-test = "0.4.5"
 serde = "1.0.228"
 async-trait = "0.1.89"

crates/buttplug_tests/tests/util/device_test/client/client_v2/client.rs

@@ -40,7 +40,6 @@ use std::sync::{
 use thiserror::Error;
 use tokio::sync::{Mutex, broadcast, mpsc, mpsc::error::SendError};
 use tracing::{Level, Span, info_span, span};
-use tracing_futures::Instrument;
 
 /// Result type used for public APIs.
 ///

crates/buttplug_tests/tests/util/device_test/client/client_v2/device.rs

@@ -40,6 +40,7 @@ use buttplug_server::message::{
 use futures::{Stream, future};
 use getset::Getters;
 use log::*;
+use tracing::Instrument;
 use std::{
   collections::HashMap,
   fmt,
@@ -49,7 +50,6 @@ use std::{
   },
 };
 use tokio::sync::{broadcast, mpsc};
-use tracing_futures::Instrument;
 
 /// Enum for messages going to a [ButtplugClientDevice] instance.
 #[derive(Clone, Debug)]

crates/buttplug_tests/tests/util/device_test/client/client_v2/in_process_connector.rs

@@ -28,7 +28,6 @@ use std::sync::{
   atomic::{AtomicBool, Ordering},
 };
 use tokio::sync::mpsc::{Sender, channel};
-use tracing_futures::Instrument;
 
 #[derive(Default)]
 pub struct ButtplugInProcessClientConnectorBuilder {

crates/buttplug_tests/tests/util/device_test/client/client_v3/client.rs

@@ -39,7 +39,6 @@ use std::sync::{
 use thiserror::Error;
 use tokio::sync::{Mutex, broadcast, mpsc};
 use tracing::info_span;
-use tracing_futures::Instrument;
 
 /// Result type used for public APIs.
 ///

crates/buttplug_tests/tests/util/device_test/client/client_v3/connector/in_process_connector.rs

@@ -28,7 +28,6 @@ use std::sync::{
   atomic::{AtomicBool, Ordering},
 };
 use tokio::sync::mpsc::{Sender, channel};
-use tracing_futures::Instrument;
 
 #[derive(Default)]
 pub struct ButtplugInProcessClientConnectorBuilder {