Update deps (#508)

* Update dependencies * Update deny.toml * Update nix * Update CHANGELOG
Riey · Jul 11, 2021 · 34ddeaf · 34ddeaf
1 parent 0de87e7
commit 34ddeaf
Show file tree

Hide file tree

Showing 9 changed files with 140 additions and 211 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/default.nix b/default.nix
@@ -16,7 +16,7 @@ llvmPackages_11.stdenv.mkDerivation rec {
   version = kimeVersion;
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
-    sha256 = "czmIhCMQ1UA6LwgA4MH6GhTHPiewVVY4DoArF+1OaxY=";
+    sha256 = "sha256-j3S457qDgHEcKC9FraiYsj/ykHB/cJVNLI2H/XcRDUk=";
   };
   LIBCLANG_PATH = "${pkgs.llvmPackages_11.libclang}/lib";
   dontUseCmakeConfigure = true;

diff --git a/deny.toml b/deny.toml
@@ -177,8 +177,7 @@ skip = [
 # dependencies starting at the specified crate, up to a certain depth, which is
 # by default infinite
 skip-tree = [
-    # wait for new release
-    { name = "wayland-client", version = "=0.28.3" },
+    { name = "criterion", version = "=0.3.4" }
 ]
 
 # This section is considered when running `cargo deny check sources`.

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -6,6 +6,8 @@
 
 ### Improve
 
+* Update dependencies [#508](https://github.com/Riey/kime/issues/508)
+
 ## 2.5.5
 
 ### Improve

diff --git a/flake.lock b/flake.lock
diff --git a/src/engine/backend/Cargo.toml b/src/engine/backend/Cargo.toml
@@ -10,4 +10,4 @@ bitflags = "1.2.1"
 enum-map = "1.0.0"
 enumset = { version = "1.0.4", features = ["serde"] }
 serde = { version = "1.0.118", features = ["derive"] }
-strum = { version = "0.20.0", features = ["derive"] }
+strum = { version = "0.21.0", features = ["derive"] }
diff --git a/src/frontends/xim/Cargo.toml b/src/frontends/xim/Cargo.toml
@@ -14,7 +14,7 @@ xim = { version = "0.1.1", default-features = false, features = ["x11rb-server",
 # xim = { path = "../../../../xim-rs", default-features = false, features = ["x11rb-server", "x11rb-xcb"] }
 
 ahash = "0.7.0"
-cairo-rs = { version = "0.9.1", features = ["xcb"] }
+cairo-rs = { version = "0.14.1", features = ["xcb"] }
 log = "0.4.11"
 x11rb = { version = "0.8.0", features = ["render"] }
 pico-args = "0.4.0"
diff --git a/src/frontends/xim/src/pe_window.rs b/src/frontends/xim/src/pe_window.rs
@@ -101,13 +101,13 @@ impl PeWindow {
             size.0 as _,
             size.1 as _,
         )
-        .unwrap();
+        .expect("Create XCB Surface");
 
         conn.map_window(preedit_window)?.check()?;
 
         conn.flush()?;
 
-        let cr = cairo::Context::new(&surface);
+        let cr = cairo::Context::new(&surface).expect("Create Cairo Context");
 
         cr.select_font_face(&font, cairo::FontSlant::Normal, cairo::FontWeight::Normal);
         cr.set_font_size(font_size);
@@ -138,12 +138,12 @@ impl PeWindow {
     fn redraw(&mut self) {
         log::trace!("Redraw: {}", self.preedit);
         self.cr.set_source_rgb(1.0, 1.0, 1.0);
-        self.cr.paint();
+        self.cr.paint().expect("Cairo paint");
 
         if !self.preedit.is_empty() {
             self.cr.set_source_rgb(0.0, 0.0, 0.0);
             self.cr.move_to(self.text_pos.0, self.text_pos.1);
-            self.cr.show_text(&self.preedit);
+            self.cr.show_text(&self.preedit).expect("Cairo show text");
         }
 
         self.surface.flush();

diff --git a/src/tools/check/Cargo.toml b/src/tools/check/Cargo.toml
@@ -11,5 +11,5 @@ kime-engine-cffi = { path = "../../engine/cffi" }
 kime-engine-core = { path = "../../engine/core" }
 pad = "0.1.6"
 serde_yaml = "0.8.17"
-strum = { version = "0.20.0", features = ["derive"] }
+strum = { version = "0.21.0", features = ["derive"] }
 xdg = "2.2.0"