Add conversions between AsciiString and Box<AsciiStr> (#85)

A248 · tormol · commit ab36f5238067 · 2022-05-31T10:03:03.000+02:00
diff --git a/src/ascii_str.rs b/src/ascii_str.rs
@@ -317,6 +317,14 @@ impl AsciiStr {
     pub fn last(&self) -> Option<AsciiChar> {
         self.slice.last().cloned()
     }
+
+    /// Converts a [`Box<AsciiStr>`] into a [`AsciiString`] without copying or allocating.
+    #[cfg(feature = "alloc")]
+    #[inline]
+    pub fn into_ascii_string(self: Box<Self>) -> AsciiString {
+        let slice = Box::<[AsciiChar]>::from(self);
+        AsciiString::from(slice.into_vec())
+    }
 }
 
 macro_rules! impl_partial_eq {
diff --git a/src/ascii_string.rs b/src/ascii_string.rs
@@ -385,6 +385,16 @@ impl AsciiString {
     pub fn clear(&mut self) {
         self.vec.clear()
     }
+
+    /// Converts this [`AsciiString`] into a [`Box`]`<`[`AsciiStr`]`>`.
+    ///
+    /// This will drop any excess capacity
+    #[cfg(feature = "alloc")]
+    #[inline]
+    pub fn into_boxed_ascii_str(self) -> Box<AsciiStr> {
+        let slice = self.vec.into_boxed_slice();
+        Box::from(slice)
+    }
 }
 
 impl Deref for AsciiString {
@@ -496,6 +506,22 @@ impl Into<String> for AsciiString {
     }
 }
 
+#[cfg(feature = "alloc")]
+impl From<Box<AsciiStr>> for AsciiString {
+    #[inline]
+    fn from(boxed: Box<AsciiStr>) -> Self {
+        boxed.into_ascii_string()
+    }
+}
+
+#[cfg(feature = "alloc")]
+impl From<AsciiString> for Box<AsciiStr> {
+    #[inline]
+    fn from(string: AsciiString) -> Self {
+        string.into_boxed_ascii_str()
+    }
+}
+
 impl<'a> From<Cow<'a, AsciiStr>> for AsciiString {
     fn from(cow: Cow<'a, AsciiStr>) -> AsciiString {
         cow.into_owned()
@@ -902,7 +928,7 @@ mod tests {
     use alloc::vec::Vec;
     #[cfg(feature = "std")]
     use std::ffi::CString;
-    use AsciiChar;
+    use ::{AsciiChar, AsciiStr};
 
     #[test]
     fn into_string() {
@@ -971,4 +997,13 @@ mod tests {
         let sparkle_heart = str::from_utf8(&sparkle_heart_bytes).unwrap();
         assert!(fmt::write(&mut s2, format_args!("{}", sparkle_heart)).is_err());
     }
+
+    #[cfg(feature = "alloc")]
+    #[test]
+    fn to_and_from_box() {
+        let string = "abc".into_ascii_string().unwrap();
+        let converted: Box<AsciiStr> = Box::from(string.clone());
+        let converted: AsciiString = converted.into();
+        assert_eq!(string, converted);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -317,6 +317,14 @@ impl AsciiStr {`
`317`	`317`	`pub fn last(&self) -> Option<AsciiChar> {`
`318`	`318`	`self.slice.last().cloned()`
`319`	`319`	`}`
	`320`	`+`
	`321`	+ /// Converts a [`Box<AsciiStr>`] into a [`AsciiString`] without copying or allocating.
	`322`	`+ #[cfg(feature = "alloc")]`
	`323`	`+ #[inline]`
	`324`	`+ pub fn into_ascii_string(self: Box<Self>) -> AsciiString {`
	`325`	`+ let slice = Box::<[AsciiChar]>::from(self);`
	`326`	`+ AsciiString::from(slice.into_vec())`
	`327`	`+ }`
`320`	`328`	`}`
`321`	`329`
`322`	`330`	`macro_rules! impl_partial_eq {`