From 85bf2b63e14b0324d58a9d6d399dc722d50817bb Mon Sep 17 00:00:00 2001
From: Nikhil Jha <hi@nikhiljha.com>
Date: Sat, 29 Feb 2020 10:13:05 -0800
Subject: [PATCH] use latest compatible crates

---
 Cargo.toml     | 10 +++++-----
 src/popover.rs |  6 +++---
 src/style.rs   |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index e59996f..eb0b20b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,16 +3,16 @@ name = "rs"
 version = "0.1.0"
 
 [dependencies]
-bitflags = "1.0.*"
-clap = { version = "2.32.*", default-features = false }
+bitflags = "1.2.*"
+clap = { version = "2.33.*", default-features = false }
 maplit = "1.0.*"
-regex = "1.1.*"
+regex = "1.3.*"
 serde = { version = "1.0.*", features = ["derive"] }
 serde_yaml = "0.8.*"
 xkbcommon = { version = "0.4.*", features = ["wayland"] }
 
 [dependencies.cairo-rs]
-version = "0.5.*"
+version = "0.8.*"
 
 [dependencies.cairo-sys-rs]
 version = ""
@@ -33,7 +33,7 @@ version = ""
 features = ["v2_44"]
 
 [dependencies.gtk]
-version = "0.5.*"
+version = "0.8.*"
 features = ["v3_22"]
 
 [dependencies.gtk-sys]
diff --git a/src/popover.rs b/src/popover.rs
index 8330a92..7e947f4 100644
--- a/src/popover.rs
+++ b/src/popover.rs
@@ -13,7 +13,7 @@ use ::resources;
 
 use gio::ActionMapExt;
 use gio::SettingsExt;
-use gio::SimpleActionExt;
+use gtk::prelude::BuilderExtManual;
 use glib::translate::FromGlibPtrNone;
 use glib::variant::ToVariant;
 use gtk::PopoverExt;
@@ -134,7 +134,7 @@ fn make_menu_builder(inputs: Vec<(&str, OwnedTranslation)>) -> gtk::Builder {
 
 fn set_layout(kind: String, name: String) {
     let settings = gio::Settings::new("org.gnome.desktop.input-sources");
-    let inputs = settings.get_value("sources").unwrap();
+    let inputs = settings.get_value("sources");
     let current = (kind.clone(), name.clone());
     let inputs = variants::get_tuples(inputs).into_iter()
         .filter(|t| t != &current);
@@ -285,7 +285,7 @@ pub fn show(
         .map(|name| LayoutId::Local(name.to_string()));
 
     let settings = gio::Settings::new("org.gnome.desktop.input-sources");
-    let inputs = settings.get_value("sources").unwrap();
+    let inputs = settings.get_value("sources");
     let inputs = variants::get_tuples(inputs);
     
     let system_layouts: Vec<LayoutId> = inputs.into_iter()
diff --git a/src/style.rs b/src/style.rs
index 153431a..2d7d539 100644
--- a/src/style.rs
+++ b/src/style.rs
@@ -99,13 +99,13 @@ fn get_theme_name(settings: &gtk::Settings) -> GtkTheme {
             name: {
                 settings.get_property("gtk-theme-name")
                     .or_print(logging::Problem::Surprise, "No theme name")
-                    .and_then(|value| value.get::<String>())
+                    .and_then(|value| value.get::<String>().unwrap())
                     .unwrap_or(DEFAULT_THEME_NAME.into())
             },
             variant: {
                 settings.get_property("gtk-application-prefer-dark-theme")
                     .or_print(logging::Problem::Surprise, "No settings key")
-                    .and_then(|value| value.get::<bool>())
+                    .and_then(|value| value.get::<bool>().unwrap())
                     .and_then(|dark_preferred| match dark_preferred {
                         true => Some("dark".into()),
                         false => None,
-- 
2.21.0 (Apple Git-122.2)