Factor out stream-guard into separate library

ProjectLighthouseCAU · May 31, 2024 · 7f0bf51 · 7f0bf51
1 parent aa4fd17
commit 7f0bf51
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 54 deletions.
diff --git a/lighthouse-client/Cargo.toml b/lighthouse-client/Cargo.toml
@@ -26,7 +26,7 @@ serde_with = "3.4"
 rmp-serde = "1.0"
 rand = "0.8"
 thiserror = "1.0.58"
-pin-project = "1.1.5"
+stream-guard = "1.0.0"
 
 [dev-dependencies]
 tracing-subscriber = { version = "0.3", features = ["env-filter", "std"] }

diff --git a/lighthouse-client/src/lib.rs b/lighthouse-client/src/lib.rs
@@ -3,15 +3,13 @@ mod connect;
 mod constants;
 mod error;
 mod lighthouse;
-mod utils;
 mod spawn;
 
 pub use check::*;
 pub use connect::*;
 pub use constants::*;
 pub use error::*;
 pub use lighthouse::*;
-pub(crate) use utils::*;
 pub use spawn::*;
 
 pub use lighthouse_protocol as protocol;
diff --git a/lighthouse-client/src/lighthouse.rs b/lighthouse-client/src/lighthouse.rs
@@ -4,8 +4,9 @@ use async_tungstenite::tungstenite::{Message, self};
 use futures::{prelude::*, channel::mpsc::{Sender, self}, stream::{SplitSink, SplitStream}, lock::Mutex};
 use lighthouse_protocol::{Authentication, ClientMessage, DirectoryTree, Frame, LaserMetrics, Model, ServerMessage, Value, Verb};
 use serde::{Deserialize, Serialize};
+use stream_guard::GuardStreamExt;
 use tracing::{warn, error, debug, info};
-use crate::{Check, Error, Result, Spawner, StreamExt};
+use crate::{Check, Error, Result, Spawner};
 
 /// A connection to the lighthouse server for sending requests and receiving events.
 pub struct Lighthouse<S> {

diff --git a/lighthouse-client/src/utils/mod.rs b/lighthouse-client/src/utils/mod.rs
diff --git a/lighthouse-client/src/utils/stream_guard.rs b/lighthouse-client/src/utils/stream_guard.rs