[fractal/fractal-next] Bump deps
- From: Julian Sparber <jsparber src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [fractal/fractal-next] Bump deps
- Date: Wed, 28 Apr 2021 13:42:39 +0000 (UTC)
commit 0cc43f62588ac43477ec1260670b15a8f546e93a
Author: Julian Sparber <julian sparber net>
Date: Wed Apr 28 15:23:59 2021 +0200
Bump deps
Cargo.lock | 100 +++++++++++++++---------------------
src/login.rs | 4 +-
src/session/content.rs | 2 +-
src/session/mod.rs | 4 +-
src/session/sidebar/category.rs | 6 +--
src/session/sidebar/category_row.rs | 6 +--
src/session/sidebar/mod.rs | 2 +-
src/session/sidebar/room.rs | 4 +-
src/session/sidebar/room_row.rs | 11 ++--
9 files changed, 59 insertions(+), 80 deletions(-)
---
diff --git a/Cargo.lock b/Cargo.lock
index 2aec51e8..7c29d3a4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -115,9 +115,9 @@ checksum = "5f093eed78becd229346bf859eec0aa4dd7ddde0757287b2b4107a1f09c80002"
[[package]]
name = "async-io"
-version = "1.4.0"
+version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "fcb9af4888a70ad78ecb5efcb0ba95d66a3cf54a88b62ae81559954c7588c7a2"
+checksum = "4bbfd5cf2794b1e908ea8457e6c45f8f8f1f6ec5f74617bf4662623f47503c3b"
dependencies = [
"concurrent-queue",
"fastrand",
@@ -127,8 +127,8 @@ dependencies = [
"once_cell",
"parking",
"polling",
+ "slab",
"socket2",
- "vec-arena",
"waker-fn",
"winapi",
]
@@ -249,7 +249,7 @@ checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba"
[[package]]
name = "cairo-rs"
version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#f042a441f8bd4e1dc4de92bd8e3fa750718bf797";
+source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5";
dependencies = [
"bitflags",
"cairo-sys-rs",
@@ -261,7 +261,7 @@ dependencies = [
[[package]]
name = "cairo-sys-rs"
version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#f042a441f8bd4e1dc4de92bd8e3fa750718bf797";
+source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5";
dependencies = [
"glib-sys",
"libc",
@@ -518,9 +518,9 @@ dependencies = [
[[package]]
name = "fastrand"
-version = "1.4.0"
+version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "ca5faf057445ce5c9d4329e382b2ce7ca38550ef3b73a5348362d5f24e0c7fe3"
+checksum = "77b705829d1e87f762c2df6da140b26af5839e1033aa84aa5f56bb688e4e1bdb"
dependencies = [
"instant",
]
@@ -745,7 +745,7 @@ dependencies = [
[[package]]
name = "gdk-pixbuf"
version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#f042a441f8bd4e1dc4de92bd8e3fa750718bf797";
+source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5";
dependencies = [
"gdk-pixbuf-sys",
"gio",
@@ -756,7 +756,7 @@ dependencies = [
[[package]]
name = "gdk-pixbuf-sys"
version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#f042a441f8bd4e1dc4de92bd8e3fa750718bf797";
+source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5";
dependencies = [
"gio-sys",
"glib-sys",
@@ -768,7 +768,7 @@ dependencies = [
[[package]]
name = "gdk4"
version = "0.1.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs#fcb47ab8c71cee003be5396da280346fca95d072";
+source = "git+https://github.com/gtk-rs/gtk4-rs#9ace190c946f83f9ef9ab70fb2b07e1fa8186ae9";
dependencies = [
"bitflags",
"cairo-rs",
@@ -783,13 +783,14 @@ dependencies = [
[[package]]
name = "gdk4-sys"
version = "0.1.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs#fcb47ab8c71cee003be5396da280346fca95d072";
+source = "git+https://github.com/gtk-rs/gtk4-rs#9ace190c946f83f9ef9ab70fb2b07e1fa8186ae9";
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
"gio-sys",
"glib-sys",
"gobject-sys",
+ "graphene-sys",
"libc",
"pango-sys",
"system-deps",
@@ -861,7 +862,7 @@ dependencies = [
[[package]]
name = "gio"
version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#f042a441f8bd4e1dc4de92bd8e3fa750718bf797";
+source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5";
dependencies = [
"bitflags",
"futures-channel",
@@ -877,7 +878,7 @@ dependencies = [
[[package]]
name = "gio-sys"
version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#f042a441f8bd4e1dc4de92bd8e3fa750718bf797";
+source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5";
dependencies = [
"glib-sys",
"gobject-sys",
@@ -889,7 +890,7 @@ dependencies = [
[[package]]
name = "glib"
version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#f042a441f8bd4e1dc4de92bd8e3fa750718bf797";
+source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5";
dependencies = [
"bitflags",
"futures-channel",
@@ -907,7 +908,7 @@ dependencies = [
[[package]]
name = "glib-macros"
version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#f042a441f8bd4e1dc4de92bd8e3fa750718bf797";
+source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5";
dependencies = [
"anyhow",
"heck",
@@ -921,7 +922,7 @@ dependencies = [
[[package]]
name = "glib-sys"
version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#f042a441f8bd4e1dc4de92bd8e3fa750718bf797";
+source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5";
dependencies = [
"libc",
"system-deps",
@@ -943,7 +944,7 @@ dependencies = [
[[package]]
name = "gobject-sys"
version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#f042a441f8bd4e1dc4de92bd8e3fa750718bf797";
+source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5";
dependencies = [
"glib-sys",
"libc",
@@ -953,7 +954,7 @@ dependencies = [
[[package]]
name = "graphene-rs"
version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#f042a441f8bd4e1dc4de92bd8e3fa750718bf797";
+source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5";
dependencies = [
"glib",
"graphene-sys",
@@ -963,7 +964,7 @@ dependencies = [
[[package]]
name = "graphene-sys"
version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#f042a441f8bd4e1dc4de92bd8e3fa750718bf797";
+source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5";
dependencies = [
"glib-sys",
"libc",
@@ -974,7 +975,7 @@ dependencies = [
[[package]]
name = "gsk4"
version = "0.1.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs#fcb47ab8c71cee003be5396da280346fca95d072";
+source = "git+https://github.com/gtk-rs/gtk4-rs#9ace190c946f83f9ef9ab70fb2b07e1fa8186ae9";
dependencies = [
"bitflags",
"cairo-rs",
@@ -989,7 +990,7 @@ dependencies = [
[[package]]
name = "gsk4-sys"
version = "0.1.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs#fcb47ab8c71cee003be5396da280346fca95d072";
+source = "git+https://github.com/gtk-rs/gtk4-rs#9ace190c946f83f9ef9ab70fb2b07e1fa8186ae9";
dependencies = [
"cairo-sys-rs",
"gdk4-sys",
@@ -1010,7 +1011,7 @@ checksum = "1874c48e670519ce192093ac906c08a6dde7cb2d18b28722ef237726a39c3a63"
[[package]]
name = "gtk4"
version = "0.1.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs#fcb47ab8c71cee003be5396da280346fca95d072";
+source = "git+https://github.com/gtk-rs/gtk4-rs#9ace190c946f83f9ef9ab70fb2b07e1fa8186ae9";
dependencies = [
"bitflags",
"cairo-rs",
@@ -1032,12 +1033,12 @@ dependencies = [
[[package]]
name = "gtk4-macros"
version = "0.1.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs#fcb47ab8c71cee003be5396da280346fca95d072";
+source = "git+https://github.com/gtk-rs/gtk4-rs#9ace190c946f83f9ef9ab70fb2b07e1fa8186ae9";
dependencies = [
"anyhow",
"heck",
- "itertools 0.9.0",
- "proc-macro-crate 0.1.5",
+ "itertools",
+ "proc-macro-crate 1.0.0",
"proc-macro-error",
"proc-macro2",
"quote",
@@ -1047,7 +1048,7 @@ dependencies = [
[[package]]
name = "gtk4-sys"
version = "0.1.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs#fcb47ab8c71cee003be5396da280346fca95d072";
+source = "git+https://github.com/gtk-rs/gtk4-rs#9ace190c946f83f9ef9ab70fb2b07e1fa8186ae9";
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
@@ -1185,15 +1186,15 @@ checksum = "4a1ce40d6fc9764887c2fdc7305c3dcc429ba11ff981c1509416afd5697e4437"
[[package]]
name = "httpdate"
-version = "0.3.2"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47"
+checksum = "05842d0d43232b23ccb7060ecb0f0626922c21f30012e97b767b30afd4a5d4b9"
[[package]]
name = "hyper"
-version = "0.14.5"
+version = "0.14.7"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "8bf09f61b52cfcf4c00de50df88ae423d6c02354e385a86341133b5338630ad1"
+checksum = "1e5f105c494081baa3bf9e200b279e27ec1623895cd504c7dbef8d0b080fcf54"
dependencies = [
"bytes",
"futures-channel",
@@ -1267,15 +1268,6 @@ version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "47be2f14c678be2fdcab04ab1171db51b2762ce6f0a8ee87c8dd4a04ed216135"
-[[package]]
-name = "itertools"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
-dependencies = [
- "either",
-]
-
[[package]]
name = "itertools"
version = "0.10.0"
@@ -1318,15 +1310,13 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libadwaita"
version = "0.1.0"
-source =
"git+https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs.git#2d09b6b566bc0fa2497612768cf0c41f582acdd7";
+source =
"git+https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs.git#da8b0fe0c606e00432bd150d6f2162a85e7b1c74";
dependencies = [
- "bitflags",
"gdk-pixbuf",
"gdk4",
"gio",
"glib",
"gtk4",
- "lazy_static",
"libadwaita-sys",
"libc",
"pango",
@@ -1335,7 +1325,7 @@ dependencies = [
[[package]]
name = "libadwaita-sys"
version = "0.1.0"
-source =
"git+https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs.git#2d09b6b566bc0fa2497612768cf0c41f582acdd7";
+source =
"git+https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs.git#da8b0fe0c606e00432bd150d6f2162a85e7b1c74";
dependencies = [
"gdk-pixbuf-sys",
"gdk4-sys",
@@ -1350,9 +1340,9 @@ dependencies = [
[[package]]
name = "libc"
-version = "0.2.93"
+version = "0.2.94"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41"
+checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e"
[[package]]
name = "linkify"
@@ -1828,7 +1818,7 @@ dependencies = [
[[package]]
name = "pango"
version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#f042a441f8bd4e1dc4de92bd8e3fa750718bf797";
+source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5";
dependencies = [
"bitflags",
"glib",
@@ -1840,7 +1830,7 @@ dependencies = [
[[package]]
name = "pango-sys"
version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#f042a441f8bd4e1dc4de92bd8e3fa750718bf797";
+source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5";
dependencies = [
"glib-sys",
"gobject-sys",
@@ -2206,9 +2196,9 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.4.5"
+version = "1.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19"
+checksum = "2a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759"
dependencies = [
"aho-corasick",
"memchr",
@@ -2808,9 +2798,9 @@ checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2"
[[package]]
name = "syn"
-version = "1.0.69"
+version = "1.0.70"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "48fe99c6bd8b1cc636890bcc071842de909d902c81ac7dab53ba33c421ab8ffb"
+checksum = "b9505f307c872bab8eb46f77ae357c8eba1fdacead58ee5a850116b1d7f82883"
dependencies = [
"proc-macro2",
"quote",
@@ -2838,7 +2828,7 @@ dependencies = [
"anyhow",
"cfg-expr",
"heck",
- "itertools 0.10.0",
+ "itertools",
"pkg-config",
"strum",
"strum_macros",
@@ -3207,12 +3197,6 @@ version = "0.2.12"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "cbdbff6266a24120518560b5dc983096efb98462e51d0d68169895b237be3e5d"
-[[package]]
-name = "vec-arena"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "34b2f665b594b07095e3ac3f718e13c2197143416fae4c5706cffb7b1af8d7f1"
-
[[package]]
name = "version-compare"
version = "0.0.11"
diff --git a/src/login.rs b/src/login.rs
index 8868ca43..50e8eba6 100644
--- a/src/login.rs
+++ b/src/login.rs
@@ -187,8 +187,8 @@ impl Login {
f: F,
) -> glib::SignalHandlerId {
self.connect_local("new-session", true, move |values| {
- let obj = values[0].get::<Self>().unwrap().unwrap();
- let session = values[1].get::<Session>().unwrap().unwrap();
+ let obj = values[0].get::<Self>().unwrap();
+ let session = values[1].get::<Session>().unwrap();
f(&obj, &session);
diff --git a/src/session/content.rs b/src/session/content.rs
index c70887af..b3a8c61b 100644
--- a/src/session/content.rs
+++ b/src/session/content.rs
@@ -71,7 +71,7 @@ mod imp {
let compact = value
.get()
.expect("type conformity checked by `Object::set_property`");
- self.compact.set(compact.unwrap());
+ self.compact.set(compact);
}
_ => unimplemented!(),
}
diff --git a/src/session/mod.rs b/src/session/mod.rs
index 9bf76d97..dbcf5f5e 100644
--- a/src/session/mod.rs
+++ b/src/session/mod.rs
@@ -94,7 +94,7 @@ mod imp {
let homeserver = value
.get()
.expect("type conformity checked by `Object::set_property`");
- let _ = self.homeserver.set(homeserver.unwrap());
+ let _ = self.homeserver.set(homeserver);
}
_ => unimplemented!(),
}
@@ -266,7 +266,7 @@ impl Session {
pub fn connect_ready<F: Fn(&Self) + 'static>(&self, f: F) -> glib::SignalHandlerId {
self.connect_local("ready", true, move |values| {
- let obj = values[0].get::<Self>().unwrap().unwrap();
+ let obj = values[0].get::<Self>().unwrap();
f(&obj);
diff --git a/src/session/sidebar/category.rs b/src/session/sidebar/category.rs
index 22d5d5e2..75adf489 100644
--- a/src/session/sidebar/category.rs
+++ b/src/session/sidebar/category.rs
@@ -118,16 +118,16 @@ mod imp {
) {
match pspec.name() {
"expanded" => {
- let expanded: Option<bool> = value
+ let expanded = value
.get()
.expect("type conformity checked by `Object::set_property`");
- self.expanded.set(expanded.unwrap());
+ self.expanded.set(expanded);
}
"display-name" => {
let name = value
.get()
.expect("type conformity checked by `Object::set_property`");
- self.name.set(name.unwrap());
+ self.name.set(name);
}
_ => unimplemented!(),
}
diff --git a/src/session/sidebar/category_row.rs b/src/session/sidebar/category_row.rs
index 2949f122..d5a4229f 100644
--- a/src/session/sidebar/category_row.rs
+++ b/src/session/sidebar/category_row.rs
@@ -77,15 +77,13 @@ mod imp {
"display-name" => {
let display_name: CategoryName = value
.get()
- .expect("type conformity checked by `Object::set_property`")
- .expect("A room always needs a display name");
+ .expect("type conformity checked by `Object::set_property`");
self.display_name.set_label(&display_name.to_string());
}
"expanded" => {
let expanded = value
.get()
- .expect("type conformity checked by `Object::set_property`")
- .unwrap();
+ .expect("type conformity checked by `Object::set_property`");
if expanded {
//self.add_css_class("expanded");
} else {
diff --git a/src/session/sidebar/mod.rs b/src/session/sidebar/mod.rs
index 034ec8dc..f3b83dbf 100644
--- a/src/session/sidebar/mod.rs
+++ b/src/session/sidebar/mod.rs
@@ -86,7 +86,7 @@ mod imp {
let compact = value
.get()
.expect("type conformity checked by `Object::set_property`");
- self.compact.set(compact.unwrap());
+ self.compact.set(compact);
}
_ => unimplemented!(),
}
diff --git a/src/session/sidebar/room.rs b/src/session/sidebar/room.rs
index e5f3b26c..47247ad7 100644
--- a/src/session/sidebar/room.rs
+++ b/src/session/sidebar/room.rs
@@ -109,9 +109,9 @@ mod imp {
match pspec.name() {
"room" => {
let room = value
- .get_some::<&BoxedRoom>()
+ .get::<BoxedRoom>()
.expect("type conformity checked by `Object::set_property`");
- let _ = self.room.set(room.clone().0);
+ let _ = self.room.set(room.0);
obj.update();
}
_ => unimplemented!(),
diff --git a/src/session/sidebar/room_row.rs b/src/session/sidebar/room_row.rs
index 9802a536..ef1dd252 100644
--- a/src/session/sidebar/room_row.rs
+++ b/src/session/sidebar/room_row.rs
@@ -95,22 +95,20 @@ mod imp {
match pspec.name() {
"avatar" => {
let _avatar = value
- .get::<gio::LoadableIcon>()
+ .get::<Option<gio::LoadableIcon>>()
.expect("type conformity checked by `Object::set_property`");
// TODO: set custom avatar https://gitlab.gnome.org/exalm/libadwaita/-/issues/29
}
"display-name" => {
let display_name = value
.get()
- .expect("type conformity checked by `Object::set_property`")
- .expect("A room always needs a display name");
+ .expect("type conformity checked by `Object::set_property`");
self.display_name.set_label(display_name);
}
"highlight" => {
let flags = value
.get::<HighlightFlags>()
- .expect("type conformity checked by `Object::set_property`")
- .unwrap();
+ .expect("type conformity checked by `Object::set_property`");
match flags {
HighlightFlags::NONE => {
self.notification_count.remove_css_class("highlight");
@@ -134,8 +132,7 @@ mod imp {
"notification-count" => {
let count = value
.get::<u64>()
- .expect("type conformity checked by `Object::set_property`")
- .unwrap();
+ .expect("type conformity checked by `Object::set_property`");
self.notification_count.set_label(&count.to_string());
self.notification_count.set_visible(count > 0);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
