diff --git a/Cargo.lock b/Cargo.lock index 976a29cb..1c948d5c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3948,7 +3948,6 @@ version = "0.0.0" dependencies = [ "anyhow", "async-trait", - "bstr", "clap", "ctrlc", "derive_more", diff --git a/crates/vite_task/Cargo.toml b/crates/vite_task/Cargo.toml index 647f2d84..7ba8f2ff 100644 --- a/crates/vite_task/Cargo.toml +++ b/crates/vite_task/Cargo.toml @@ -15,7 +15,6 @@ workspace = true anyhow = { workspace = true } async-trait = { workspace = true } wincode = { workspace = true, features = ["derive"] } -bstr = { workspace = true } clap = { workspace = true, features = ["derive"] } ctrlc = { workspace = true } derive_more = { workspace = true, features = ["from"] } diff --git a/crates/vite_task/src/lib.rs b/crates/vite_task/src/lib.rs index a20687c3..c1659756 100644 --- a/crates/vite_task/src/lib.rs +++ b/crates/vite_task/src/lib.rs @@ -1,6 +1,5 @@ mod cli; mod collections; -mod maybe_str; pub mod session; // Public exports for vite_task_bin diff --git a/crates/vite_task/src/maybe_str.rs b/crates/vite_task/src/maybe_str.rs deleted file mode 100644 index 404abf1b..00000000 --- a/crates/vite_task/src/maybe_str.rs +++ /dev/null @@ -1,49 +0,0 @@ -use std::{ - fmt::Debug, - ops::{Deref, DerefMut}, -}; - -use bstr::BStr; -use serde::Serialize; -use wincode::{SchemaRead, SchemaWrite}; - -/// Similar to `bstr::BString`, but also implements `wincode::{SchemaWrite, SchemaRead}`, -/// and serializes losslessly to utf8 for outputting debug json - -#[derive(SchemaWrite, SchemaRead)] -#[expect(dead_code, reason = "struct fields accessed via Deref>")] -pub struct MaybeString(Vec); - -impl From> for MaybeString { - fn from(value: Vec) -> Self { - Self(value) - } -} - -impl Deref for MaybeString { - type Target = Vec; - - fn deref(&self) -> &Self::Target { - &self.0 - } -} -impl DerefMut for MaybeString { - fn deref_mut(&mut self) -> &mut Self::Target { - &mut self.0 - } -} - -impl Debug for MaybeString { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - Debug::fmt(BStr::new(&self.0), f) - } -} - -impl Serialize for MaybeString { - fn serialize(&self, serializer: S) -> Result - where - S: serde::Serializer, - { - serializer.collect_str(&bstr::ByteSlice::escape_bytes(self.0.as_slice())) - } -}