Merge pull request #287 from federicomenaquintero/surface-create-similar-result

(#251): Surface::create_similar() and friends should return a Result

Author: GuillaumeGomez

.travis.yml

@@ -15,10 +15,10 @@ matrix:
       rust: beta
       env: GTK=3.24 FEATURES=
     - os: linux
-      rust: 1.36.0
+      rust: 1.39.0
       env: GTK=3.14 FEATURES=
     - os: linux
-      rust: 1.36.0
+      rust: 1.39.0
       env: GTK=3.24 FEATURES=
     - os: osx
       rust: nightly

src/device.rs

@@ -67,29 +67,30 @@ impl Device {
         unsafe { ffi::cairo_script_set_mode(self.to_raw_none(), mode.into()) }
     }
 
-    pub fn surface_create(&self, content: Content, width: f64, height: f64) -> Option<Surface> {
+    pub fn surface_create(
+        &self,
+        content: Content,
+        width: f64,
+        height: f64,
+    ) -> Result<Surface, Status> {
         unsafe {
-            let p =
-                ffi::cairo_script_surface_create(self.to_raw_none(), content.into(), width, height);
-            if p.is_null() {
-                None
-            } else {
-                Some(Surface::from_raw_full(p))
-            }
+            Ok(Surface::from_raw_full(ffi::cairo_script_surface_create(
+                self.to_raw_none(),
+                content.into(),
+                width,
+                height,
+            ))?)
         }
     }
 
-    pub fn surface_create_for_target(&self, target: &Surface) -> Option<Surface> {
+    pub fn surface_create_for_target(&self, target: &Surface) -> Result<Surface, Status> {
         unsafe {
-            let p = ffi::cairo_script_surface_create_for_target(
-                self.to_raw_none(),
-                target.to_raw_none(),
-            );
-            if p.is_null() {
-                None
-            } else {
-                Some(Surface::from_raw_full(p))
-            }
+            Ok(Surface::from_raw_full(
+                ffi::cairo_script_surface_create_for_target(
+                    self.to_raw_none(),
+                    target.to_raw_none(),
+                ),
+            )?)
         }
     }
 

src/enums.rs

@@ -274,6 +274,14 @@ impl Status {
             panic!("Cairo error {:?}", self)
         }
     }
+
+    pub(crate) fn to_result<T>(self, obj: T) -> Result<T, Self> {
+        if self == Status::Success {
+            Ok(obj)
+        } else {
+            Err(self)
+        }
+    }
 }
 
 #[cfg(feature = "use_glib")]

src/image_surface.rs

@@ -17,31 +17,9 @@ use surface::Surface;
 use BorrowError;
 use Status;
 
-#[derive(Debug)]
-pub struct ImageSurface(Surface);
-
-impl TryFrom<Surface> for ImageSurface {
-    type Error = Surface;
-
-    fn try_from(surface: Surface) -> Result<ImageSurface, Surface> {
-        if surface.get_type() == SurfaceType::Image {
-            Ok(ImageSurface(surface))
-        } else {
-            Err(surface)
-        }
-    }
-}
+declare_surface!(ImageSurface, SurfaceType::Image);
 
 impl ImageSurface {
-    pub unsafe fn from_raw_full(ptr: *mut ffi::cairo_surface_t) -> Result<ImageSurface, Status> {
-        let surface = Self::try_from(Surface::from_raw_full(ptr)).unwrap();
-        let status = surface.status();
-        match status {
-            Status::Success => Ok(surface),
-            _ => Err(status),
-        }
-    }
-
     pub fn create(format: Format, width: i32, height: i32) -> Result<ImageSurface, Status> {
         unsafe {
             Self::from_raw_full(ffi::cairo_image_surface_create(
@@ -119,73 +97,6 @@ impl ImageSurface {
     }
 }
 
-#[cfg(feature = "use_glib")]
-impl<'a> ToGlibPtr<'a, *mut ffi::cairo_surface_t> for ImageSurface {
-    type Storage = &'a Surface;
-
-    #[inline]
-    fn to_glib_none(&'a self) -> Stash<'a, *mut ffi::cairo_surface_t, Self> {
-        let stash = self.0.to_glib_none();
-        Stash(stash.0, stash.1)
-    }
-
-    #[inline]
-    fn to_glib_full(&self) -> *mut ffi::cairo_surface_t {
-        unsafe { ffi::cairo_surface_reference(self.0.to_glib_none().0) }
-    }
-}
-
-#[cfg(feature = "use_glib")]
-impl FromGlibPtrNone<*mut ffi::cairo_surface_t> for ImageSurface {
-    #[inline]
-    unsafe fn from_glib_none(ptr: *mut ffi::cairo_surface_t) -> ImageSurface {
-        Self::try_from(from_glib_none::<_, Surface>(ptr)).unwrap()
-    }
-}
-
-#[cfg(feature = "use_glib")]
-impl FromGlibPtrBorrow<*mut ffi::cairo_surface_t> for ImageSurface {
-    #[inline]
-    unsafe fn from_glib_borrow(ptr: *mut ffi::cairo_surface_t) -> ImageSurface {
-        Self::try_from(from_glib_borrow::<_, Surface>(ptr)).unwrap()
-    }
-}
-
-#[cfg(feature = "use_glib")]
-impl FromGlibPtrFull<*mut ffi::cairo_surface_t> for ImageSurface {
-    #[inline]
-    unsafe fn from_glib_full(ptr: *mut ffi::cairo_surface_t) -> ImageSurface {
-        Self::from_raw_full(ptr).unwrap()
-    }
-}
-
-#[cfg(feature = "use_glib")]
-gvalue_impl!(
-    ImageSurface,
-    ffi::cairo_surface_t,
-    ffi::gobject::cairo_gobject_surface_get_type
-);
-
-impl Deref for ImageSurface {
-    type Target = Surface;
-
-    fn deref(&self) -> &Surface {
-        &self.0
-    }
-}
-
-impl Clone for ImageSurface {
-    fn clone(&self) -> ImageSurface {
-        ImageSurface(self.0.clone())
-    }
-}
-
-impl fmt::Display for ImageSurface {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "ImageSurface")
-    }
-}
-
 #[derive(Debug)]
 pub struct ImageSurfaceData<'a> {
     surface: &'a mut ImageSurface,

src/lib.rs

@@ -158,6 +158,8 @@ pub use xcb::{
     XCBVisualType,
 };
 
+#[macro_use]
+mod surface_macros;
 #[macro_use]
 mod user_data;
 mod constants;