Add a Status.to_result() and use it throughout instead of match{}

Thanks to @EPashkin for the suggestion.

Author: federicomenaquintero

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/pdf.rs

@@ -63,20 +63,14 @@ impl PdfSurface {
         unsafe {
             ffi::cairo_pdf_surface_restrict_to_version(self.inner.to_raw_none(), version.into());
         }
-        match self.status() {
-            Status::Success => Ok(()),
-            s => Err(s),
-        }
+        self.status().to_result(())
     }
 
     pub fn set_size(&self, width: f64, height: f64) -> Result<(), Status> {
         unsafe {
             ffi::cairo_pdf_surface_set_size(self.inner.to_raw_none(), width, height);
         }
-        match self.status() {
-            Status::Success => Ok(()),
-            s => Err(s),
-        }
+        self.status().to_result(())
     }
 
     #[cfg(any(all(feature = "pdf", feature = "v1_16"), feature = "dox"))]
@@ -89,10 +83,7 @@ impl PdfSurface {
                 value.as_ptr(),
             );
         }
-        match self.status() {
-            Status::Success => Ok(()),
-            s => Err(s),
-        }
+        self.status().to_result(())
     }
 
     #[cfg(any(all(feature = "pdf", feature = "v1_16"), feature = "dox"))]
@@ -101,10 +92,7 @@ impl PdfSurface {
         unsafe {
             ffi::cairo_pdf_surface_set_page_label(self.inner.to_raw_none(), label.as_ptr());
         }
-        match self.status() {
-            Status::Success => Ok(()),
-            s => Err(s),
-        }
+        self.status().to_result(())
     }
 
     #[cfg(any(all(feature = "pdf", feature = "v1_16"), feature = "dox"))]
@@ -116,10 +104,7 @@ impl PdfSurface {
                 height as _,
             );
         }
-        match self.status() {
-            Status::Success => Ok(()),
-            s => Err(s),
-        }
+        self.status().to_result(())
     }
 
     #[cfg(any(all(feature = "pdf", feature = "v1_16"), feature = "dox"))]
@@ -143,10 +128,7 @@ impl PdfSurface {
             ) as _
         };
 
-        match self.status() {
-            Status::Success => Ok(res),
-            s => Err(s),
-        }
+        self.status().to_result(res)
     }
 }
 

src/surface.rs

@@ -35,10 +35,7 @@ impl Surface {
     pub unsafe fn from_raw_full(ptr: *mut ffi::cairo_surface_t) -> Result<Surface, Status> {
         assert!(!ptr.is_null());
         let status = Status::from(ffi::cairo_surface_status(ptr));
-        match status {
-            Status::Success => Ok(Surface(ptr, false)),
-            _ => Err(status),
-        }
+        status.to_result(Surface(ptr, false))
     }
 
     pub fn to_raw_none(&self) -> *mut ffi::cairo_surface_t {
@@ -120,20 +117,17 @@ impl Surface {
 
         let status = unsafe {
             let mime_type = CString::new(mime_type).unwrap();
-            ffi::cairo_surface_set_mime_data(
+            Status::from(ffi::cairo_surface_set_mime_data(
                 self.to_raw_none(),
                 mime_type.as_ptr(),
                 data,
                 size as c_ulong,
                 Some(unbox::<T>),
                 user_data as *mut _,
-            )
+            ))
         };
 
-        match Status::from(status) {
-            Status::Success => Ok(()),
-            x => Err(x),
-        }
+        status.to_result(())
     }
 
     pub fn supports_mime_type(&self, mime_type: &str) -> bool {

src/xcb.rs

@@ -342,10 +342,7 @@ impl XCBSurface {
 
     pub fn set_size(&self, width: i32, height: i32) -> Result<(), Status> {
         unsafe { ffi::cairo_xcb_surface_set_size(self.to_raw_none(), width, height) }
-        match self.status() {
-            Status::Success => Ok(()),
-            s => Err(s),
-        }
+        self.status().to_result(())
     }
 
     pub fn set_drawable(
@@ -362,10 +359,7 @@ impl XCBSurface {
                 height,
             )
         }
-        match self.status() {
-            Status::Success => Ok(()),
-            s => Err(s),
-        }
+        self.status().to_result(())
     }
 }