From 6cf8d39ee4f20826eea0f2e992ae18ceffcd2fca Mon Sep 17 00:00:00 2001
From: Felix Zwettler <f.zwettler@posteo.de>
Date: Mon, 24 Jul 2023 09:42:55 +0200
Subject: [PATCH 1/2] Bump pango, cairo to v0.18

---
 piet-cairo/Cargo.toml  | 6 +++---
 piet-common/Cargo.toml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/piet-cairo/Cargo.toml b/piet-cairo/Cargo.toml
index 9598fcf8..bbb82bd6 100644
--- a/piet-cairo/Cargo.toml
+++ b/piet-cairo/Cargo.toml
@@ -13,9 +13,9 @@ categories = ["rendering::graphics-api"]
 [dependencies]
 piet = { version = "=0.6.2", path = "../piet" }
 
-cairo-rs = { version = "0.17.0", default-features = false } # We don't need glib
-pango = { version = "0.17.0", features = ["v1_44"] }
-pangocairo = "0.17.0"
+cairo-rs = { version = "0.18.0", default-features = false } # We don't need glib
+pango = { version = "0.18.0", features = ["v1_44"] }
+pangocairo = "0.18.0"
 unicode-segmentation = "1.10.0"
 xi-unicode = "0.3.0"
 
diff --git a/piet-common/Cargo.toml b/piet-common/Cargo.toml
index 996e287e..50904e4b 100644
--- a/piet-common/Cargo.toml
+++ b/piet-common/Cargo.toml
@@ -40,8 +40,8 @@ png = { version = "0.17.7", optional = true }
 
 [target.'cfg(any(target_os="linux", target_os="openbsd", target_os="freebsd", target_os="netbsd"))'.dependencies]
 piet-cairo = { version = "=0.6.2", path = "../piet-cairo" }
-cairo-rs = { version = "0.17.0", default_features = false }
-cairo-sys-rs = { version = "0.17.0" }
+cairo-rs = { version = "0.18.0", default_features = false }
+cairo-sys-rs = { version = "0.18.0" }
 
 [target.'cfg(any(target_os="macos", target_os="ios"))'.dependencies]
 piet-coregraphics = { version = "=0.6.2", path = "../piet-coregraphics" }

From cc6d22b63895fd78385ad837910339627a63397a Mon Sep 17 00:00:00 2001
From: Felix Zwettler <f.zwettler@posteo.de>
Date: Mon, 24 Jul 2023 20:31:13 +0200
Subject: [PATCH 2/2] satisfy clippy

---
 piet-web/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/piet-web/src/lib.rs b/piet-web/src/lib.rs
index 93578f71..8e21ef6d 100644
--- a/piet-web/src/lib.rs
+++ b/piet-web/src/lib.rs
@@ -544,7 +544,7 @@ impl WebRenderContext<'_> {
     fn set_stroke(&mut self, width: f64, style: Option<&StrokeStyle>) {
         let default_style = StrokeStyle::default();
         let style = style.unwrap_or(&default_style);
-        let mut canvas_state = self.canvas_states.last_mut().unwrap();
+        let canvas_state = self.canvas_states.last_mut().unwrap();
 
         if width != canvas_state.line_width {
             self.ctx.set_line_width(width);