Fixes for last commit

Cargo.toml

@@ -152,7 +152,7 @@ ouroboros = "0.17"
 palette = "0.7"
 qrcode = { version = "0.12", default-features = false }
 raw-window-handle = "0.5"
-resvg = "0.36"
+resvg = "0.37"
 rustc-hash = "1.0"
 sctk = { package = "smithay-client-toolkit", git = "https://github.com/smithay/client-toolkit", rev = "2e9bf9f" }
 smol = "1.0"

graphics/src/text/editor.rs

@@ -30,12 +30,13 @@ impl Editor {
         Self::default()
     }
 
-    /// Runs a closure with the buffer of the [`Editor`].
-    pub fn with_buffer<F: FnOnce(&cosmic_text::Buffer) -> T, T>(
-        &self,
-        f: F,
-    ) -> T {
-        self.internal().editor.with_buffer(f)
+    /// Returns the buffer of the [`Editor`].
+    pub fn buffer(&self) -> &cosmic_text::Buffer {
+        match self.internal().editor.buffer_ref() {
+            cosmic_text::BufferRef::Owned(buffer) => buffer,
+            cosmic_text::BufferRef::Borrowed(buffer) => buffer,
+            cosmic_text::BufferRef::Arc(buffer) => buffer,
+        }
     }
 
     /// Creates a [`Weak`] reference to the [`Editor`].
@@ -86,16 +87,14 @@ impl editor::Editor for Editor {
     }
 
     fn line(&self, index: usize) -> Option<&str> {
-        let buffer = match self.internal().editor.buffer_ref() {
-            cosmic_text::BufferRef::Owned(buffer) => buffer,
-            cosmic_text::BufferRef::Borrowed(buffer) => buffer,
-            cosmic_text::BufferRef::Arc(buffer) => buffer,
-        };
-        buffer.lines.get(index).map(cosmic_text::BufferLine::text)
+        self.buffer()
+            .lines
+            .get(index)
+            .map(cosmic_text::BufferLine::text)
     }
 
     fn line_count(&self) -> usize {
-        self.with_buffer(|buffer| buffer.lines.len())
+        self.buffer().lines.len()
     }
 
     fn selection(&self) -> Option<String> {

tiny_skia/src/text.rs

@@ -83,20 +83,18 @@ impl Pipeline {
 
         let mut font_system = font_system().write().expect("Write font system");
 
-        editor.with_buffer(|buffer| {
-            draw(
-                font_system.raw(),
-                &mut self.glyph_cache,
-                buffer,
-                Rectangle::new(position, editor.bounds()),
-                color,
-                alignment::Horizontal::Left,
-                alignment::Vertical::Top,
-                scale_factor,
-                pixels,
-                clip_mask,
-            );
-        });
+        draw(
+            font_system.raw(),
+            &mut self.glyph_cache,
+            editor.buffer(),
+            Rectangle::new(position, editor.bounds()),
+            color,
+            alignment::Horizontal::Left,
+            alignment::Vertical::Top,
+            scale_factor,
+            pixels,
+            clip_mask,
+        );
     }
 
     pub fn draw_cached(