From ea2c9a29868a2df0b13806ced368ff41705ca4c2 Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte@element.io>
Date: Thu, 10 Mar 2022 11:28:55 +0100
Subject: [PATCH] ci: Use clippy instead of check for wasm checks

---
 .github/workflows/wasm.yml                     | 1 +
 crates/matrix-sdk-indexeddb/src/cryptostore.rs | 3 ++-
 crates/matrix-sdk-indexeddb/src/state_store.rs | 2 +-
 crates/matrix-sdk/src/client.rs                | 2 +-
 crates/matrix-sdk/src/config/client.rs         | 2 +-
 xtask/src/ci.rs                                | 3 ++-
 6 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/wasm.yml b/.github/workflows/wasm.yml
index b0b056e5e..e341eacff 100644
--- a/.github/workflows/wasm.yml
+++ b/.github/workflows/wasm.yml
@@ -44,6 +44,7 @@ jobs:
       with:
         toolchain: stable
         target: wasm32-unknown-unknown
+        components: clippy
         profile: minimal
         override: true
 
diff --git a/crates/matrix-sdk-indexeddb/src/cryptostore.rs b/crates/matrix-sdk-indexeddb/src/cryptostore.rs
index 9320047fe..85e4050b3 100644
--- a/crates/matrix-sdk-indexeddb/src/cryptostore.rs
+++ b/crates/matrix-sdk-indexeddb/src/cryptostore.rs
@@ -204,7 +204,7 @@ impl IndexeddbStore {
 
         let db: IdbDatabase = db_req.into_future().await?;
 
-        let tx: IdbTransaction =
+        let tx: IdbTransaction<'_> =
             db.transaction_on_one_with_mode("matrix-sdk-crypto", IdbTransactionMode::Readwrite)?;
         let ob = tx.object_store("matrix-sdk-crypto")?;
 
@@ -918,6 +918,7 @@ impl CryptoStore for IndexeddbStore {
         self.users_for_key_query()
     }
 
+    #[allow(clippy::todo)]
     async fn load_backup_keys(&self) -> Result<BackupKeys, CryptoStoreError> {
         todo!()
     }
diff --git a/crates/matrix-sdk-indexeddb/src/state_store.rs b/crates/matrix-sdk-indexeddb/src/state_store.rs
index 0184054de..9af422d95 100644
--- a/crates/matrix-sdk-indexeddb/src/state_store.rs
+++ b/crates/matrix-sdk-indexeddb/src/state_store.rs
@@ -217,7 +217,7 @@ impl IndexeddbStore {
 
         let db: IdbDatabase = db_req.into_future().await?;
 
-        let tx: IdbTransaction =
+        let tx: IdbTransaction<'_> =
             db.transaction_on_one_with_mode("matrix-sdk-state", IdbTransactionMode::Readwrite)?;
         let ob = tx.object_store("matrix-sdk-state")?;
 
diff --git a/crates/matrix-sdk/src/client.rs b/crates/matrix-sdk/src/client.rs
index 16ab9011d..496c24319 100644
--- a/crates/matrix-sdk/src/client.rs
+++ b/crates/matrix-sdk/src/client.rs
@@ -1104,7 +1104,7 @@ impl Client {
     /// [`get_sso_login_url`]: #method.get_sso_login_url
     /// [`restore_login`]: #method.restore_login
     #[instrument(skip(token))]
-    #[deny(clippy::future_not_send)]
+    #[cfg_attr(not(target_arch = "wasm32"), deny(clippy::future_not_send))]
     pub async fn login_with_token(
         &self,
         token: &str,
diff --git a/crates/matrix-sdk/src/config/client.rs b/crates/matrix-sdk/src/config/client.rs
index 752f3e881..8639c7953 100644
--- a/crates/matrix-sdk/src/config/client.rs
+++ b/crates/matrix-sdk/src/config/client.rs
@@ -137,7 +137,7 @@ mod store_helpers {
     ) -> Result<Box<StateStore>> {
         Ok(Box::new(match passphrase {
             Some(pass) => StateStore::open_with_passphrase(name.to_owned(), pass).await?,
-            _ => StateStore::open_with_name(name.to_string()).await?,
+            _ => StateStore::open_with_name(name.to_owned()).await?,
         }))
     }
 }
diff --git a/xtask/src/ci.rs b/xtask/src/ci.rs
index 3d4478f4c..ce04b8c2c 100644
--- a/xtask/src/ci.rs
+++ b/xtask/src/ci.rs
@@ -185,8 +185,9 @@ fn run_wasm_checks(cmd: Option<WasmFeatureSet>) -> Result<()> {
     ]);
 
     let run = |arg_set: &str| {
-        cmd!("rustup run stable cargo check --target wasm32-unknown-unknown")
+        cmd!("rustup run stable cargo clippy --target wasm32-unknown-unknown")
             .args(arg_set.split_whitespace())
+            .args(["--", "-D", "warnings"])
             .run()
     };