From 61b0a4f3206ebd532535027789fa96ce42c1beeb Mon Sep 17 00:00:00 2001 From: Charles Hall Date: Sat, 23 Dec 2023 20:40:56 -0800 Subject: [PATCH 1/2] comment out heed backend; code doesn't compile --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 91de132c1..e9dc01cde 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -121,7 +121,7 @@ default = ["conduit_bin", "backend_rocksdb", "systemd", "zstd_compression"] #backend_sled = ["sled"] backend_persy = ["persy", "parking_lot"] backend_sqlite = ["sqlite"] -backend_heed = ["heed", "crossbeam"] +#backend_heed = ["heed", "crossbeam"] backend_rocksdb = ["rocksdb"] jemalloc = ["tikv-jemalloc-ctl", "tikv-jemallocator"] sqlite = ["rusqlite", "parking_lot", "tokio/signal"] From 6f65722c70ca723e3192d2518151c6a2f4523e01 Mon Sep 17 00:00:00 2001 From: Charles Hall Date: Sat, 23 Dec 2023 19:40:08 -0800 Subject: [PATCH 2/2] use constructor to avoid deprecation warnings --- src/api/client_server/session.rs | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/api/client_server/session.rs b/src/api/client_server/session.rs index 5f2360c29..679d704fe 100644 --- a/src/api/client_server/session.rs +++ b/src/api/client_server/session.rs @@ -161,16 +161,7 @@ pub async fn login_route(body: Ruma) -> Result