fixup! Drop redundant #![feature(assert_matches)]

matter-labs · Aug 27, 2024 · e6e8dcf · e6e8dcf
1 parent 145e7b6
commit e6e8dcf
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/core/lib/multivm/Cargo.toml b/core/lib/multivm/Cargo.toml
@@ -41,6 +41,7 @@ vise.workspace = true
 
 [dev-dependencies]
 tokio = { workspace = true, features = ["time"] }
+assert_matches.workspace = true
 zksync_test_account.workspace = true
 ethabi.workspace = true
 zksync_eth_signer.workspace = true
diff --git a/core/lib/multivm/src/versions/vm_fast/tests/bootloader.rs b/core/lib/multivm/src/versions/vm_fast/tests/bootloader.rs
@@ -1,5 +1,4 @@
-use std::assert_matches::assert_matches;
-
+use assert_matches::assert_matches;
 use zksync_types::U256;
 
 use crate::{

diff --git a/core/lib/multivm/src/versions/vm_fast/tests/simple_execution.rs b/core/lib/multivm/src/versions/vm_fast/tests/simple_execution.rs
@@ -1,4 +1,4 @@
-use std::assert_matches::assert_matches;
+use assert_matches::assert_matches;
 
 use crate::{
     interface::{ExecutionResult, VmExecutionMode, VmInterface},

diff --git a/core/lib/multivm/src/versions/vm_latest/tests/bootloader.rs b/core/lib/multivm/src/versions/vm_latest/tests/bootloader.rs
@@ -1,5 +1,4 @@
-use std::assert_matches::assert_matches;
-
+use assert_matches::assert_matches;
 use zksync_types::U256;
 
 use crate::{

diff --git a/core/lib/multivm/src/versions/vm_latest/tests/simple_execution.rs b/core/lib/multivm/src/versions/vm_latest/tests/simple_execution.rs
@@ -1,4 +1,4 @@
-use std::assert_matches::assert_matches;
+use assert_matches::assert_matches;
 
 use crate::{
     interface::{ExecutionResult, VmExecutionMode, VmInterface},

diff --git a/core/lib/types/src/contract_verification_api.rs b/core/lib/types/src/contract_verification_api.rs
@@ -243,7 +243,7 @@ pub enum DeployContractCalldata {
 
 #[cfg(test)]
 mod tests {
-    use std::assert_matches::assert_matches;
+    use assert_matches::assert_matches;
 
     use super::SourceCodeData;
 

diff --git a/core/lib/types/src/transaction_request.rs b/core/lib/types/src/transaction_request.rs
@@ -980,8 +980,7 @@ pub fn validate_factory_deps(
 
 #[cfg(test)]
 mod tests {
-    use std::assert_matches::assert_matches;
-
+    use assert_matches::assert_matches;
     use zksync_crypto_primitives::K256PrivateKey;
 
     use super::*;

diff --git a/core/lib/vm_interface/Cargo.toml b/core/lib/vm_interface/Cargo.toml
@@ -19,3 +19,6 @@ hex.workspace = true
 serde.workspace = true
 thiserror.workspace = true
 tracing.workspace = true
+
+[dev-dependencies]
+assert_matches.workspace = true
diff --git a/core/lib/vm_interface/src/types/errors/vm_revert_reason.rs b/core/lib/vm_interface/src/types/errors/vm_revert_reason.rs
@@ -169,7 +169,7 @@ impl fmt::Display for VmRevertReason {
 
 #[cfg(test)]
 mod tests {
-    use std::assert_matches::assert_matches;
+    use assert_matches::assert_matches;
 
     use super::VmRevertReason;