Merge branch 'master' into cstring_conv

Author: Thomas Bahn

RELEASES.md

@@ -3,6 +3,8 @@ Unreleased
 * Implement the `std::ops::AddAssign` trait for `AsciiString`.
 * Implement the `IntoAsciiString` trait for `std::ffi::CStr` and `std::ffi::CString` types,
   and implemented the `AsAsciiStr` trait for `std::ffi::CStr` type.
+* Implement the `IntoAsciiString` for `std::borrow::Cow`, where the inner types themselves
+  implement `IntoAsciiString`.
 
 Version 0.9.1 (2018-09-12)
 ==========================

src/ascii_string.rs

@@ -854,6 +854,41 @@ impl<'a> IntoAsciiString for &'a CStr {
     }
 }
 
+impl<'a, B: ?Sized> IntoAsciiString for Cow<'a, B>
+where
+    B: 'a + ToOwned,
+    &'a B: IntoAsciiString,
+    <B as ToOwned>::Owned: IntoAsciiString,
+{
+    #[inline]
+    unsafe fn into_ascii_string_unchecked(self) -> AsciiString {
+        IntoAsciiString::into_ascii_string_unchecked(self.into_owned())
+    }
+
+    fn into_ascii_string(self) -> Result<AsciiString, FromAsciiError<Self>> {
+        match self {
+            Cow::Owned(b) => {
+                IntoAsciiString::into_ascii_string(b)
+                    .map_err(|FromAsciiError { error, owner }| {
+                        FromAsciiError {
+                            owner: Cow::Owned(owner),
+                            error: error,
+                        }
+                    })
+            }
+            Cow::Borrowed(b) => {
+                IntoAsciiString::into_ascii_string(b)
+                    .map_err(|FromAsciiError { error, owner }| {
+                        FromAsciiError {
+                            owner: Cow::Borrowed(owner),
+                            error: error,
+                        }
+                    })
+            }
+        }
+    }
+}
+
 #[cfg(feature = "quickcheck")]
 impl Arbitrary for AsciiString {
     fn arbitrary<G: Gen>(g: &mut G) -> Self {