diff --git a/Cargo.lock b/Cargo.lock index e756f6a2b..a04519d4d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2020,9 +2020,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2030,9 +2030,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" dependencies = [ "bumpalo", "log", @@ -2057,9 +2057,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2067,9 +2067,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", @@ -2080,9 +2080,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" [[package]] name = "web-sys" diff --git a/Cargo.toml b/Cargo.toml index 3c07f94e8..106931ffd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -66,8 +66,7 @@ serde_json = "1.0.91" serde-wasm-bindgen = "0.5.0" tracing = { version = "0.1.36", default-features = false, features = ["std"] } tracing-subscriber = { version = "0.3.14", default-features = false, features = ["registry", "std", "ansi"] } -# 0.2.88 causes breakage, per https://github.com/rustwasm/wasm-bindgen/issues/3685 -wasm-bindgen = "=0.2.87" +wasm-bindgen = "0.2.89" wasm-bindgen-futures = "0.4.33" zeroize = "1.6.0" diff --git a/src/encryption.rs b/src/encryption.rs index d496e3ffd..72cc1e4af 100644 --- a/src/encryption.rs +++ b/src/encryption.rs @@ -86,17 +86,6 @@ pub enum EncryptionAlgorithm { MegolmV1AesSha2, } -impl From for JsValue { - fn from(value: EncryptionAlgorithm) -> Self { - use EncryptionAlgorithm::*; - - match value { - OlmV1Curve25519AesSha2 => JsValue::from(0), - MegolmV1AesSha2 => JsValue::from(1), - } - } -} - impl From for matrix_sdk_crypto::types::EventEncryptionAlgorithm { fn from(value: EncryptionAlgorithm) -> Self { use EncryptionAlgorithm::*; diff --git a/src/verification.rs b/src/verification.rs index f3575bacd..3ab40b3bd 100644 --- a/src/verification.rs +++ b/src/verification.rs @@ -41,19 +41,6 @@ pub enum VerificationMethod { ReciprocateV1 = 3, } -impl From for JsValue { - fn from(value: VerificationMethod) -> Self { - use VerificationMethod::*; - - match value { - SasV1 => JsValue::from(0), - QrCodeScanV1 => JsValue::from(1), - QrCodeShowV1 => JsValue::from(2), - ReciprocateV1 => JsValue::from(3), - } - } -} - impl TryFrom for VerificationMethod { type Error = JsError;