From 5cdddd92d55e301fdae474ad6dc85418c170d287 Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Tue, 16 Jul 2024 10:16:02 -0700
Subject: [PATCH] Merge remote-tracking branch
 'origin/topic/bbannier/bump-spicy'

* origin/topic/bbannier/bump-spicy:
  Bump auxil/spicy to latest development snapshot

(cherry picked from commit 9ba7c2ddafd73dd2d00ab301d9aa8f501d819f4f)
---
 auxil/spicy                               | 2 +-
 src/analyzer/protocol/finger/finger.spicy | 2 +-
 src/analyzer/protocol/syslog/syslog.spicy | 2 +-
 src/spicy/spicyz/glue-compiler.cc         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/auxil/spicy b/auxil/spicy
index 6581b1855a..4a1b43ef07 160000
--- a/auxil/spicy
+++ b/auxil/spicy
@@ -1 +1 @@
-Subproject commit 6581b1855a5ea8cc102c66b4ac6a431fc67484a0
+Subproject commit 4a1b43ef07d1305a7e88a4f0866068dc49de9d06
diff --git a/src/analyzer/protocol/finger/finger.spicy b/src/analyzer/protocol/finger/finger.spicy
index dd07dbb7c3..0d6a8da54e 100644
--- a/src/analyzer/protocol/finger/finger.spicy
+++ b/src/analyzer/protocol/finger/finger.spicy
@@ -15,7 +15,7 @@ public type Request  = unit {
 
     switch {
         -> : /\/W/ { self.whois = True; }
-        -> void;
+        -> : void;
     };
 
     : OptionalWhiteSpace;
diff --git a/src/analyzer/protocol/syslog/syslog.spicy b/src/analyzer/protocol/syslog/syslog.spicy
index fd4c845870..ba8c8a77aa 100644
--- a/src/analyzer/protocol/syslog/syslog.spicy
+++ b/src/analyzer/protocol/syslog/syslog.spicy
@@ -7,7 +7,7 @@ import spicy;
 public type Message = unit {
     switch {
         -> prio: Priority;
-        -> void;
+        -> : void;
     };
 
     msg: bytes &eod;
diff --git a/src/spicy/spicyz/glue-compiler.cc b/src/spicy/spicyz/glue-compiler.cc
index cc17312343..e9240ed245 100644
--- a/src/spicy/spicyz/glue-compiler.cc
+++ b/src/spicy/spicyz/glue-compiler.cc
@@ -1375,7 +1375,7 @@ bool GlueCompiler::CreateSpicyHook(glue::Event* ev) {
 
     auto attrs = builder()->attributeSet({builder()->attribute("&priority", builder()->integer(ev->priority))});
     auto parameters = hilti::util::transform(ev->parameters, [](const auto& p) { return p.get(); });
-    auto unit_hook = builder()->declarationHook(parameters, body.block(), ::spicy::Engine::All, attrs, meta);
+    auto unit_hook = builder()->declarationHook(parameters, body.block(), attrs, meta);
     auto hook_decl = builder()->declarationUnitHook(ev->hook, unit_hook, meta);
     ev->spicy_module->spicy_module->add(context(), hook_decl);