[librsvg: 3/14] Missed a few conversions
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg: 3/14] Missed a few conversions
- Date: Tue, 23 Mar 2021 19:57:56 +0000 (UTC)
commit 2be23355e16ed90cfd832d00d3bc35b7a571e0ca
Author: Federico Mena Quintero <federico gnome org>
Date: Mon Mar 22 13:42:47 2021 -0600
Missed a few conversions
src/c_api/handle.rs | 46 +++++++++++++---------------------------------
1 file changed, 13 insertions(+), 33 deletions(-)
---
diff --git a/src/c_api/handle.rs b/src/c_api/handle.rs
index ba30814e..78206073 100644
--- a/src/c_api/handle.rs
+++ b/src/c_api/handle.rs
@@ -1850,13 +1850,7 @@ pub unsafe extern "C" fn rsvg_handle_set_stylesheet(
}
};
- match rhandle.set_stylesheet(css) {
- Ok(()) => true.to_glib(),
- Err(e) => {
- set_gerror(error, 0, &format!("{}", e));
- false.to_glib()
- }
- }
+ rhandle.set_stylesheet(css).into_gerror(error)
}
#[no_mangle]
@@ -1940,14 +1934,9 @@ pub unsafe extern "C" fn rsvg_handle_render_document(
let rhandle = get_rust_handle(handle);
let cr = from_glib_none(cr);
- match rhandle.render_document(&cr, &(*viewport).into()) {
- Ok(()) => true.to_glib(),
-
- Err(e) => {
- set_gerror(error, 0, &format!("{}", e));
- false.to_glib()
- }
- }
+ rhandle
+ .render_document(&cr, &(*viewport).into())
+ .into_gerror(error)
}
#[no_mangle]
@@ -1971,8 +1960,9 @@ pub unsafe extern "C" fn rsvg_handle_get_geometry_for_layer(
let id: Option<String> = from_glib_none(id);
- match rhandle.get_geometry_for_layer(id.as_deref(), &(*viewport).into()) {
- Ok((ink_rect, logical_rect)) => {
+ rhandle
+ .get_geometry_for_layer(id.as_deref(), &(*viewport).into())
+ .map(|(ink_rect, logical_rect)| {
if !out_ink_rect.is_null() {
*out_ink_rect = ink_rect;
}
@@ -1981,14 +1971,9 @@ pub unsafe extern "C" fn rsvg_handle_get_geometry_for_layer(
*out_logical_rect = logical_rect;
}
- true.to_glib()
- }
-
- Err(e) => {
- set_gerror(error, 0, &format!("{}", e));
- false.to_glib()
- }
- }
+ ()
+ })
+ .into_gerror(error)
}
#[no_mangle]
@@ -2012,14 +1997,9 @@ pub unsafe extern "C" fn rsvg_handle_render_layer(
let cr = from_glib_none(cr);
let id: Option<String> = from_glib_none(id);
- match rhandle.render_layer(&cr, id.as_deref(), &(*viewport).into()) {
- Ok(()) => true.to_glib(),
-
- Err(e) => {
- set_gerror(error, 0, &format!("{}", e));
- false.to_glib()
- }
- }
+ rhandle
+ .render_layer(&cr, id.as_deref(), &(*viewport).into())
+ .into_gerror(error)
}
#[no_mangle]
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]