diff --git a/crates/matrix-sdk-crypto/src/verification/qrcode.rs b/crates/matrix-sdk-crypto/src/verification/qrcode.rs index e9e421fb4..4969a81cf 100644 --- a/crates/matrix-sdk-crypto/src/verification/qrcode.rs +++ b/crates/matrix-sdk-crypto/src/verification/qrcode.rs @@ -789,8 +789,8 @@ impl QrState { mod tests { use std::{convert::TryFrom, sync::Arc}; - use matrix_sdk_qrcode::QrVerificationData; use matrix_sdk_common::locks::Mutex; + use matrix_sdk_qrcode::QrVerificationData; use matrix_sdk_test::async_test; use ruma::{device_id, event_id, room_id, user_id, DeviceId, UserId}; diff --git a/crates/matrix-sdk-crypto/src/verification/requests.rs b/crates/matrix-sdk-crypto/src/verification/requests.rs index 1e056c8c6..02da91b18 100644 --- a/crates/matrix-sdk-crypto/src/verification/requests.rs +++ b/crates/matrix-sdk-crypto/src/verification/requests.rs @@ -17,9 +17,9 @@ use std::{ time::Duration, }; +use matrix_sdk_common::instant::Instant; #[cfg(feature = "qrcode")] use matrix_sdk_qrcode::QrVerificationData; -use matrix_sdk_common::instant::Instant; use ruma::{ events::{ key::verification::{ diff --git a/xtask/src/ci.rs b/xtask/src/ci.rs index 74c78a572..36c836c74 100644 --- a/xtask/src/ci.rs +++ b/xtask/src/ci.rs @@ -61,7 +61,7 @@ enum FeatureSet { #[derive(Subcommand, PartialEq, Eq, PartialOrd, Ord)] #[allow(clippy::enum_variant_names)] enum WasmFeatureSet { - MatrixQrcode, + MatrixSdkQrcode, MatrixSdkNoDefault, MatrixSdkBase, MatrixSdkCommon, @@ -199,7 +199,7 @@ fn run_appservice_tests() -> Result<()> { fn run_wasm_checks(cmd: Option) -> Result<()> { let args = BTreeMap::from([ - (WasmFeatureSet::MatrixQrcode, "-p matrix-sdk-qrcode"), + (WasmFeatureSet::MatrixSdkQrcode, "-p matrix-sdk-qrcode"), ( WasmFeatureSet::MatrixSdkNoDefault, "-p matrix-sdk --no-default-features --features rustls-tls", @@ -260,7 +260,7 @@ fn run_wasm_checks(cmd: Option) -> Result<()> { fn run_wasm_pack_tests(cmd: Option) -> Result<()> { let args = BTreeMap::from([ - (WasmFeatureSet::MatrixQrcode, ("matrix-sdk-qrcode", "")), + (WasmFeatureSet::MatrixSdkQrcode, ("matrix-sdk-qrcode", "")), ( WasmFeatureSet::MatrixSdkNoDefault, ("matrix-sdk", "--no-default-features --features rustls-tls --lib"),