From f00e76e493766f47e2f44e0dc688fd0b760f8982 Mon Sep 17 00:00:00 2001
From: Federico Mena Quintero <federico@gnome.org>
Date: Mon, 30 Jan 2023 16:33:29 -0600
Subject: rsvg-bench.rs: Adapt to the new cairo crate API

Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/789>
---
 src/bin/rsvg-bench.rs | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'src/bin/rsvg-bench.rs')

diff --git a/src/bin/rsvg-bench.rs b/src/bin/rsvg-bench.rs
index 82aae657..080887a8 100644
--- a/src/bin/rsvg-bench.rs
+++ b/src/bin/rsvg-bench.rs
@@ -53,15 +53,15 @@ enum LoadingError {
 #[derive(Debug, Fail)]
 enum ProcessingError {
     #[fail(display = "Cairo error: {:?}", status)]
-    CairoError { status: cairo::Status },
+    CairoError { error: cairo::Error },
 
     #[fail(display = "Rendering error")]
     RenderingError,
 }
 
-impl From<cairo::Status> for ProcessingError {
-    fn from(status: cairo::Status) -> ProcessingError {
-        ProcessingError::CairoError { status: status }
+impl From<cairo::Error> for ProcessingError {
+    fn from(error: cairo::Error) -> ProcessingError {
+        ProcessingError::CairoError { error }
     }
 }
 
@@ -139,14 +139,9 @@ fn render_to_cairo(opt: &Opt, handle: &librsvg::SvgHandle) -> Result<(), Process
     let renderer = librsvg::CairoRenderer::new(handle);
 
     let surface = cairo::ImageSurface::create(cairo::Format::ARgb32, 100, 100)?;
-    let cr = cairo::Context::new(&surface);
+    let cr = cairo::Context::new(&surface)?;
 
-    let viewport = cairo::Rectangle {
-        x: 0.0,
-        y: 0.0,
-        width: 100.0,
-        height: 100.0,
-    };
+    let viewport = cairo::Rectangle::new(0.0, 0.0, 100.0, 100.0);
 
     match (opt.hard_failures, renderer.render_document(&cr, &viewport)) {
         (_, Ok(_)) => Ok(()),
-- 
cgit v1.2.1