Merge pull request #826 from jf2048/into-value-variant

Implement From<T> for Value, Variant

Author: sdroege

cairo/src/context.rs

@@ -71,6 +71,14 @@ impl fmt::Display for RectangleList {
 #[repr(transparent)]
 pub struct Context(ptr::NonNull<cairo_t>);
 
+#[cfg(feature = "use_glib")]
+impl IntoGlibPtr<*mut ffi::cairo_t> for Context {
+    #[inline]
+    unsafe fn into_glib_ptr(self) -> *mut ffi::cairo_t {
+        (&*std::mem::ManuallyDrop::new(self)).to_glib_none().0
+    }
+}
+
 #[cfg(feature = "use_glib")]
 impl<'a> ToGlibPtr<'a, *mut ffi::cairo_t> for &'a Context {
     type Storage = &'a Context;

cairo/src/device.rs

@@ -311,6 +311,14 @@ impl Device {
     }
 }
 
+#[cfg(feature = "use_glib")]
+impl IntoGlibPtr<*mut ffi::cairo_device_t> for Device {
+    #[inline]
+    unsafe fn into_glib_ptr(self) -> *mut ffi::cairo_device_t {
+        std::mem::ManuallyDrop::new(self).to_glib_none().0
+    }
+}
+
 #[cfg(feature = "use_glib")]
 impl<'a> ToGlibPtr<'a, *mut ffi::cairo_device_t> for Device {
     type Storage = &'a Device;

cairo/src/enums.rs

@@ -42,6 +42,13 @@ macro_rules! gvalue_impl {
                 <Self as glib::StaticType>::static_type()
             }
         }
+
+        impl From<$name> for glib::Value {
+            #[inline]
+            fn from(v: $name) -> Self {
+                glib::value::ToValue::to_value(&v)
+            }
+        }
     };
 }
 

cairo/src/lib.rs

@@ -86,6 +86,20 @@ macro_rules! gvalue_impl {
             }
         }
 
+        impl From<$name> for glib::Value {
+            fn from(v: $name) -> Self {
+                unsafe {
+                    let mut value =
+                        glib::Value::from_type(<$name as glib::StaticType>::static_type());
+                    glib::gobject_ffi::g_value_take_boxed(
+                        value.to_glib_none_mut().0,
+                        glib::translate::IntoGlibPtr::into_glib_ptr(v) as *mut _,
+                    );
+                    value
+                }
+            }
+        }
+
         impl glib::value::ToValueOptional for $name {
             fn to_value_optional(s: Option<&Self>) -> glib::Value {
                 let mut value = glib::Value::for_value_type::<Self>();

cairo/src/region.rs

@@ -15,6 +15,14 @@ use crate::ffi::cairo_region_t;
 #[repr(transparent)]
 pub struct Region(ptr::NonNull<cairo_region_t>);
 
+#[cfg(feature = "use_glib")]
+impl IntoGlibPtr<*mut ffi::cairo_region_t> for Region {
+    #[inline]
+    unsafe fn into_glib_ptr(self) -> *mut ffi::cairo_region_t {
+        (&*std::mem::ManuallyDrop::new(self)).to_glib_none().0
+    }
+}
+
 #[cfg(feature = "use_glib")]
 #[doc(hidden)]
 impl<'a> ToGlibPtr<'a, *mut ffi::cairo_region_t> for &'a Region {

cairo/src/surface.rs

@@ -289,6 +289,14 @@ impl Surface {
     }
 }
 
+#[cfg(feature = "use_glib")]
+impl IntoGlibPtr<*mut ffi::cairo_surface_t> for Surface {
+    #[inline]
+    unsafe fn into_glib_ptr(self) -> *mut ffi::cairo_surface_t {
+        std::mem::ManuallyDrop::new(self).to_glib_none().0
+    }
+}
+
 #[cfg(feature = "use_glib")]
 impl<'a> ToGlibPtr<'a, *mut ffi::cairo_surface_t> for Surface {
     type Storage = &'a Surface;

cairo/src/surface_macros.rs

@@ -35,6 +35,14 @@ macro_rules! declare_surface {
             }
         }
 
+        #[cfg(feature = "use_glib")]
+        impl IntoGlibPtr<*mut ffi::cairo_surface_t> for $surf_name {
+            #[inline]
+            unsafe fn into_glib_ptr(self) -> *mut ffi::cairo_surface_t {
+                std::mem::ManuallyDrop::new(self).to_glib_none().0
+            }
+        }
+
         #[cfg(feature = "use_glib")]
         impl<'a> ToGlibPtr<'a, *mut ffi::cairo_surface_t> for $surf_name {
             type Storage = &'a Surface;

gdk-pixbuf/src/auto/enums.rs

@@ -88,6 +88,13 @@ impl ToValue for Colorspace {
     }
 }
 
+impl From<Colorspace> for glib::Value {
+    #[inline]
+    fn from(v: Colorspace) -> Self {
+        ToValue::to_value(&v)
+    }
+}
+
 #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy)]
 #[non_exhaustive]
 #[doc(alias = "GdkInterpType")]
@@ -180,6 +187,13 @@ impl ToValue for InterpType {
     }
 }
 
+impl From<InterpType> for glib::Value {
+    #[inline]
+    fn from(v: InterpType) -> Self {
+        ToValue::to_value(&v)
+    }
+}
+
 #[cfg_attr(feature = "v2_42", deprecated = "Since 2.42")]
 #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy)]
 #[non_exhaustive]
@@ -263,6 +277,13 @@ impl ToValue for PixbufAlphaMode {
     }
 }
 
+impl From<PixbufAlphaMode> for glib::Value {
+    #[inline]
+    fn from(v: PixbufAlphaMode) -> Self {
+        ToValue::to_value(&v)
+    }
+}
+
 #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy)]
 #[non_exhaustive]
 #[doc(alias = "GdkPixbufError")]
@@ -393,6 +414,13 @@ impl ToValue for PixbufError {
     }
 }
 
+impl From<PixbufError> for glib::Value {
+    #[inline]
+    fn from(v: PixbufError) -> Self {
+        ToValue::to_value(&v)
+    }
+}
+
 #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy)]
 #[non_exhaustive]
 #[doc(alias = "GdkPixbufRotation")]
@@ -484,3 +512,10 @@ impl ToValue for PixbufRotation {
         Self::static_type()
     }
 }
+
+impl From<PixbufRotation> for glib::Value {
+    #[inline]
+    fn from(v: PixbufRotation) -> Self {
+        ToValue::to_value(&v)
+    }
+}

gdk-pixbuf/src/auto/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4)
-from gir-files (https://github.com/gtk-rs/gir-files @ 3b6fe0a33676)
+Generated by gir (https://github.com/gtk-rs/gir @ 0eeebbdf9d4d)
+from gir-files (https://github.com/gtk-rs/gir-files @ d8382a5920b8)

gdk-pixbuf/sys/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4)
-from gir-files (https://github.com/gtk-rs/gir-files @ 3b6fe0a33676)
+Generated by gir (https://github.com/gtk-rs/gir @ 0eeebbdf9d4d)
+from gir-files (https://github.com/gtk-rs/gir-files @ d8382a5920b8)