Merge pull request #858 from sdroege/0.16-backports

0.16 backports

glib/src/gstring.rs

@@ -2,7 +2,7 @@
 
 use crate::translate::*;
 use crate::types::{StaticType, Type};
-use std::borrow::Borrow;
+use std::borrow::{Borrow, Cow};
 use std::cmp::Ordering;
 use std::ffi::{CStr, CString, OsStr};
 use std::fmt;
@@ -16,7 +16,7 @@ use std::slice;
 use std::string::String;
 
 // rustdoc-stripper-ignore-next
-/// Representaion of a borrowed [`GString`].
+/// Representation of a borrowed [`GString`].
 ///
 /// This type is very similar to [`std::ffi::CStr`], but with one added constraint: the string
 /// must also be valid UTF-8.
@@ -740,6 +740,18 @@ impl From<&CStr> for GString {
     }
 }
 
+impl<'a> From<GString> for Cow<'a, GStr> {
+    fn from(v: GString) -> Self {
+        Cow::Owned(v)
+    }
+}
+
+impl<'a> From<&'a GStr> for Cow<'a, GStr> {
+    fn from(v: &'a GStr) -> Self {
+        Cow::Borrowed(v)
+    }
+}
+
 #[doc(hidden)]
 impl FromGlibPtrFull<*mut u8> for GString {
     #[inline]

glib/src/translate.rs

@@ -579,6 +579,15 @@ pub trait IntoGlibPtr<P: Ptr> {
     unsafe fn into_glib_ptr(self) -> P;
 }
 
+impl<P: Ptr, T: IntoGlibPtr<P>> IntoGlibPtr<P> for Option<T> {
+    #[inline]
+    unsafe fn into_glib_ptr(self) -> P {
+        self.map_or(Ptr::from::<()>(ptr::null_mut()), |s| {
+            IntoGlibPtr::into_glib_ptr(s)
+        })
+    }
+}
+
 impl GlibPtrDefault for str {
     type GlibType = *mut c_char;
 }