Merge branch 'client-arc'

Author: poljar

crates/matrix-sdk-appservice/src/webserver/warp.rs

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::{net::ToSocketAddrs, result::Result as StdResult};
+use std::net::ToSocketAddrs;
 
 use matrix_sdk::{
     bytes::Bytes,
@@ -168,7 +168,7 @@ mod handlers {
         _user_id: String,
         appservice: AppService,
         request: http::Request<Bytes>,
-    ) -> StdResult<impl warp::Reply, Rejection> {
+    ) -> Result<impl warp::Reply, Rejection> {
         if let Some(user_exists) = appservice.event_handler.users.lock().await.as_mut() {
             let request =
                 query_user::IncomingRequest::try_from_http_request(request).map_err(Error::from)?;
@@ -185,7 +185,7 @@ mod handlers {
         _room_id: String,
         appservice: AppService,
         request: http::Request<Bytes>,
-    ) -> StdResult<impl warp::Reply, Rejection> {
+    ) -> Result<impl warp::Reply, Rejection> {
         if let Some(room_exists) = appservice.event_handler.rooms.lock().await.as_mut() {
             let request =
                 query_room::IncomingRequest::try_from_http_request(request).map_err(Error::from)?;
@@ -202,7 +202,7 @@ mod handlers {
         _txn_id: String,
         appservice: AppService,
         request: http::Request<Bytes>,
-    ) -> StdResult<impl warp::Reply, Rejection> {
+    ) -> Result<impl warp::Reply, Rejection> {
         let incoming_transaction: ruma::api::appservice::event::push_events::v1::IncomingRequest =
             ruma::api::IncomingRequest::try_from_http_request(request).map_err(Error::from)?;
 
@@ -224,7 +224,7 @@ struct ErrorMessage {
     message: String,
 }
 
-pub async fn handle_rejection(err: Rejection) -> std::result::Result<impl Reply, Rejection> {
+pub async fn handle_rejection(err: Rejection) -> Result<impl Reply, Rejection> {
     if err.find::<Unauthorized>().is_some() || err.find::<warp::reject::InvalidQuery>().is_some() {
         let code = http::StatusCode::UNAUTHORIZED;
         let message = "UNAUTHORIZED";

crates/matrix-sdk-base/Cargo.toml

@@ -50,7 +50,7 @@ default-features = false
 features = ["sync", "fs"]
 
 [dev-dependencies]
-futures = { version = "0.3.15", default-features = false }
+futures = { version = "0.3.15", default-features = false, features = ["executor"] }
 http = "0.2.4"
 matrix-sdk-test = { version = "0.4.0", path = "../matrix-sdk-test" }
 

crates/matrix-sdk-common/Cargo.toml

@@ -33,7 +33,7 @@ version = "0.1.9"
 features = ["now"]
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-futures-util = { version = "0.3.15", default-features = false }
-futures-locks = { version = "0.6.0", default-features = false }
+async-lock = "2.4.0"
+futures-util = { version = "0.3.15", default-features = false, features = ["channel"] }
 wasm-bindgen-futures = "0.4.24"
 uuid = { version = "0.8.2", default-features = false, features = ["v4", "wasm-bindgen"] }

crates/matrix-sdk-common/src/locks.rs

@@ -1,8 +1,4 @@
-// could switch to futures-lock completely at some point, blocker:
-// https://github.com/asomers/futures-locks/issues/34
-// https://www.reddit.com/r/rust/comments/f4zldz/i_audited_3_different_implementation_of_async/
-
 #[cfg(target_arch = "wasm32")]
-pub use futures_locks::{Mutex, MutexGuard, RwLock, RwLockReadGuard, RwLockWriteGuard};
+pub use async_lock::{Mutex, MutexGuard, RwLock, RwLockReadGuard, RwLockWriteGuard};
 #[cfg(not(target_arch = "wasm32"))]
 pub use tokio::sync::{Mutex, MutexGuard, RwLock, RwLockReadGuard, RwLockWriteGuard};

crates/matrix-sdk-crypto/Cargo.toml

@@ -56,7 +56,7 @@ criterion = { version = "0.3.4", features = [
     "async_tokio",
     "html_reports",
 ] }
-futures = { version = "0.3.15", default-features = false }
+futures = { version = "0.3.15", default-features = false, features = ["executor"] }
 http = "0.2.4"
 indoc = "1.0.3"
 matches = "0.1.8"

crates/matrix-sdk/Cargo.toml

@@ -108,7 +108,7 @@ features = ["wasm-bindgen"]
 [dev-dependencies]
 anyhow = "1.0"
 dirs = "3.0.2"
-futures = { version = "0.3.15", default-features = false }
+futures = { version = "0.3.15", default-features = false, features = ["executor"] }
 lazy_static = "1.4.0"
 matches = "0.1.8"
 matrix-sdk-test = { version = "0.4.0", path = "../matrix-sdk-test" }