Use error conversion

src/rust/Cargo.toml

@@ -13,7 +13,7 @@ use_winit = ["winit", "vellogd-shared/use_winit"]
 
 [dependencies]
 libc = "0.2.155"
-savvy = "*"
+savvy = { git = "https://github.com/yutannihilation/savvy.git", branch = "feat/error-conversion2" }
 vellogd-shared.workspace = true
 vello.workspace = true
 peniko.workspace = true

src/rust/src/lib.rs

@@ -51,14 +51,10 @@ fn save_as_png(filename: &str) -> savvy::Result<()> {
             .tx
             .send_event(vellogd_shared::protocol::Request::SaveAsPng {
                 filename: filename.into(),
-            })
-            .map_err(|_| "failed to request to write out as PNG".into())
+            })?;
     }
 
-    #[cfg(not(feature = "use_winit"))]
-    {
-        Ok(())
-    }
+    Ok(())
 }
 
 // #[savvy]

src/rust/src/vello_device/default.rs

@@ -37,15 +37,14 @@ impl VelloGraphicsDevice {
 
 impl WindowController for VelloGraphicsDevice {
     fn send_event(&self, event: Request) -> savvy::Result<()> {
-        VELLO_APP_PROXY
-            .tx
-            .send_event(event)
-            .map_err(|e| format!("Failed to send event {e:?}").into())
+        VELLO_APP_PROXY.tx.send_event(event)?;
+        Ok(())
     }
 
     fn recv_response(&self) -> savvy::Result<Response> {
-        let receiver = VELLO_APP_PROXY.rx.lock().map_err(|e| e.to_string())?;
-        receiver.recv().map_err(|e| e.to_string().into())
+        let receiver = VELLO_APP_PROXY.rx.lock()?;
+        let res = receiver.recv()?;
+        Ok(res)
     }
 }
 

src/rust/src/vello_device/mod.rs

@@ -11,6 +11,7 @@ pub use no_winit::VelloGraphicsDevice;
 
 mod with_server;
 
+use savvy::savvy_err;
 use vellogd_shared::protocol::{Request, Response};
 pub use with_server::VelloGraphicsDeviceWithServer;
 
@@ -73,7 +74,7 @@ pub trait WindowController {
         self.send_event(Request::GetWindowSizes)?;
         match self.recv_response()? {
             Response::WindowSizes { width, height } => Ok((width, height)),
-            _ => Err("Unexpected result".into()),
+            _ => Err(savvy_err!("Unexpected result")),
         }
     }
 

src/rust/src/vello_device/with_server.rs

@@ -88,11 +88,13 @@ impl VelloGraphicsDeviceWithServer {
 
 impl WindowController for VelloGraphicsDeviceWithServer {
     fn send_event(&self, event: vellogd_shared::protocol::Request) -> savvy::Result<()> {
-        self.tx.send(event).map_err(|e| e.to_string().into())
+        self.tx.send(event)?;
+        Ok(())
     }
 
     fn recv_response(&self) -> savvy::Result<vellogd_shared::protocol::Response> {
-        self.rx.recv().map_err(|e| e.to_string().into())
+        let res = self.rx.recv()?;
+        Ok(res)
     }
 }