Merge branch 'main' into tincho/new-upstream-1-by-1

matter-labs · Jan 23, 2025 · ecfb2a8 · ecfb2a8
2 parents b701526 + 87e8c5e
commit ecfb2a8
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -131,7 +131,6 @@ jobs:
       - name: Install cross v0.2.5 from source
         run: cargo install cross --git https://github.com/cross-rs/cross --tag v0.2.5
 
-
       # We diverge from upstream and build with cross as we're building static binaries
       - name: Build binaries
         env:

diff --git a/crates/script/src/verify.rs b/crates/script/src/verify.rs
@@ -210,7 +210,7 @@ impl VerifyBundle {
 
             let contract_bytecode_hash = foundry_zksync_core::hash_bytecode(bytecode);
             if bytecode_hash == contract_bytecode_hash {
-                if artifact.source.extension().map_or(false, |e| e.to_str() == Some("vy")) {
+                if artifact.source.extension().is_some_and(|e| e.to_str() == Some("vy")) {
                     warn!("Skipping verification of Vyper contract: {}", artifact.name);
                 }
 

diff --git a/crates/zksync/compilers/tests/zksync_tests.rs b/crates/zksync/compilers/tests/zksync_tests.rs
@@ -496,7 +496,7 @@ contract Util {}
     assert!(compiled.output().errors.iter().any(|error| error
         .formatted_message
         .as_ref()
-        .map_or(false, |msg| msg.contains("File outside of allowed directories"))));
+        .is_some_and(|msg| msg.contains("File outside of allowed directories"))));
 }
 
 #[test]