[fractal] chore: Update ruma-identifiers to 0.16
- From: Daniel Garcia Moreno <danigm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [fractal] chore: Update ruma-identifiers to 0.16
- Date: Tue, 19 May 2020 08:52:32 +0000 (UTC)
commit 40594922ed5fd92aa730e4e0851c55b1005d4db0
Author: Igor Raits <ignatenko src gnome org>
Date: Tue May 19 09:25:09 2020 +0200
chore: Update ruma-identifiers to 0.16
Signed-off-by: Igor Raits <ignatenko src gnome org>
Cargo.lock | 14 +++++++-------
fractal-gtk/Cargo.toml | 4 ++++
fractal-matrix-api/Cargo.toml | 2 +-
fractal-matrix-api/src/backend/room.rs | 4 ++--
4 files changed, 14 insertions(+), 10 deletions(-)
---
diff --git a/Cargo.lock b/Cargo.lock
index ac6d6066..f95efb55 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -613,6 +613,7 @@ dependencies = [
"pangocairo",
"rand 0.7.3",
"regex",
+ "ruma-identifiers",
"secret-service",
"serde",
"serde_json",
@@ -2387,13 +2388,12 @@ dependencies = [
[[package]]
name = "ruma-identifiers"
-version = "0.14.1"
+version = "0.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07e442c700a3b33fc4dd4a1c4b463ebdd252d2c2db31b83da6bb3009307039b9"
+checksum = "77c93b9d5f951a2fb57b19c048a05ac1dbdb280ff7617ec6b02f54bf14318ed8"
dependencies = [
"rand 0.7.3",
"serde",
- "url 2.1.1",
]
[[package]]
@@ -2480,18 +2480,18 @@ dependencies = [
[[package]]
name = "serde"
-version = "1.0.104"
+version = "1.0.110"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
+checksum = "99e7b308464d16b56eba9964e4972a3eee817760ab60d88c3f86e1fecb08204c"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.104"
+version = "1.0.110"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
+checksum = "818fbf6bfa9a42d3bfcaca148547aa00c7b915bec71d1757aa2d44ca68771984"
dependencies = [
"proc-macro2 1.0.9",
"quote 1.0.2",
diff --git a/fractal-gtk/Cargo.toml b/fractal-gtk/Cargo.toml
index cc3b85f7..2d504c08 100644
--- a/fractal-gtk/Cargo.toml
+++ b/fractal-gtk/Cargo.toml
@@ -37,6 +37,10 @@ serde_json = "1.0.48"
git = "https://gitlab.gnome.org/World/Rust/sourceview4-rs.git"
rev = "fa8819fa7ecbe56f44d951656d3825f468915754"
+[dependencies.ruma-identifiers]
+version = "0.16"
+features = ["rand"]
+
[dependencies.gst]
version = "0.15.3"
package = "gstreamer"
diff --git a/fractal-matrix-api/Cargo.toml b/fractal-matrix-api/Cargo.toml
index 67581aba..74ae20e0 100644
--- a/fractal-matrix-api/Cargo.toml
+++ b/fractal-matrix-api/Cargo.toml
@@ -21,7 +21,7 @@ lazy_static = "1.4.0"
log = "0.4.8"
md5 = "0.7.0"
regex = "1.3.4"
-ruma-identifiers = "0.14.1"
+ruma-identifiers = "0.16"
serde_json = "1.0.48"
time = "0.2.7"
urlencoding = "1.0.0"
diff --git a/fractal-matrix-api/src/backend/room.rs b/fractal-matrix-api/src/backend/room.rs
index ff13e978..f6193d86 100644
--- a/fractal-matrix-api/src/backend/room.rs
+++ b/fractal-matrix-api/src/backend/room.rs
@@ -1,7 +1,7 @@
use log::error;
use serde_json::json;
-use ruma_identifiers::{Error as IdError, EventId, RoomId, RoomIdOrAliasId, UserId};
+use ruma_identifiers::{Error as IdError, EventId, RoomId, UserId};
use std::fs;
use url::Url;
@@ -315,7 +315,7 @@ pub fn join_room(bk: &Backend, base: Url, access_token: AccessToken, room_id: Ro
let tx = bk.tx.clone();
let data = bk.data.clone();
- let room_id_or_alias_id = RoomIdOrAliasId::RoomId(room_id.clone());
+ let room_id_or_alias_id = room_id.clone().into();
let params = JoinRoomParameters {
access_token,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]