From 57c9ffd4437093dc49a1774d1f249e6d19d18e77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20=C4=8Euri=C5=A1?=
 <tomas.duris@gendigital.com>
Date: Wed, 22 Nov 2023 10:47:59 +0100
Subject: [PATCH] fix: errors that occured while merging

---
 Cargo.lock                 | 13 +++++++------
 yara-x/src/wasm/builder.rs | 24 ++++++++++++------------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b87bf7550..4a53a28d8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -561,7 +561,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn 2.0.39",
 ]
 
 [[package]]
@@ -584,7 +584,7 @@ checksum = "79cff32df5cfea75e6484eeff0b4e48ad3977fb6582676a7862b3590dddc7a87"
 dependencies = [
  "serde",
  "serde_json",
- "yansi",
+ "yansi 0.5.1",
 ]
 
 [[package]]
@@ -1774,7 +1774,7 @@ dependencies = [
  "serde-wasm-bindgen",
  "serde_json",
  "strum",
- "strum_macros 0.24.3",
+ "strum_macros",
  "wasm-bindgen",
 ]
 
@@ -3095,6 +3095,7 @@ dependencies = [
  "syn 2.0.39",
 ]
 
+[[package]]
 name = "subtle"
 version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -4301,7 +4302,7 @@ dependencies = [
  "protobuf",
  "protobuf-json-mapping",
  "serde_json",
- "strum_macros 0.25.3",
+ "strum_macros",
  "superconsole",
  "wild",
  "yansi 0.5.1",
@@ -4372,12 +4373,12 @@ dependencies = [
  "chrono",
  "globwalk",
  "goldenfile",
- "itertools 0.11.0",
+ "itertools 0.12.0",
  "protobuf",
  "protobuf-codegen",
  "protobuf-parse",
  "protobuf-support",
- "yansi",
+ "yansi 0.5.1",
 ]
 
 [[package]]
diff --git a/yara-x/src/wasm/builder.rs b/yara-x/src/wasm/builder.rs
index 5057356d4..5f42c5c9a 100644
--- a/yara-x/src/wasm/builder.rs
+++ b/yara-x/src/wasm/builder.rs
@@ -467,38 +467,38 @@ mod tests {
         assert_eq!(
             text,
             r#"(module
-  (func (;118;) (type 1) (result i32)
+  (func (;120;) (type 1) (result i32)
     i32.const 0
     global.set 2
     i32.const 0
     global.set 3
-    call 119
-    call 120
+    call 121
+    call 122
     global.get 3
   )
-  (func (;119;) (type 0)
+  (func (;121;) (type 0)
     block ;; label = @1
-      call 121
+      call 123
     end
     block ;; label = @1
-      call 122
+      call 124
     end
   )
-  (func (;120;) (type 0)
+  (func (;122;) (type 0)
     block ;; label = @1
-      call 123
+      call 125
     end
   )
-  (func (;121;) (type 0)
+  (func (;123;) (type 0)
     i32.const 4
   )
-  (func (;122;) (type 0)
+  (func (;124;) (type 0)
     i32.const 5
   )
-  (func (;123;) (type 0)
+  (func (;125;) (type 0)
     i32.const 6
   )
-  (export "main" (func 118))
+  (export "main" (func 120))
 )"#
         );
     }