From 20c089e1664fadce54a44cee7d6055ab92923f3e Mon Sep 17 00:00:00 2001
From: C3pa <41503714+C3pa@users.noreply.github.com>
Date: Mon, 15 May 2023 17:56:54 +0200
Subject: meta: add some spaces to improve readability

---
 meta/template/jit.profile.lua | 4 ++--
 meta/template/jit.util.lua    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/template/jit.profile.lua b/meta/template/jit.profile.lua
index d0e788ce..a7db77bf 100644
--- a/meta/template/jit.profile.lua
+++ b/meta/template/jit.profile.lua
@@ -4,14 +4,14 @@
 local profile = {}
 
 ---@param mode string
----@param func fun(L:thread,samples:integer,vmst:string)
+---@param func fun(L: thread, samples: integer, vmst: string)
 function profile.start(mode, func)
 end
 
 function profile.stop()
 end
 
----@overload fun(th:thread,fmt:string,depth:integer)
+---@overload fun(th: thread, fmt: string, depth: integer)
 ---@param fmt string
 ---@param depth integer
 function profile.dumpstack(fmt, depth)
diff --git a/meta/template/jit.util.lua b/meta/template/jit.util.lua
index 08694286..cf525527 100644
--- a/meta/template/jit.util.lua
+++ b/meta/template/jit.util.lua
@@ -105,7 +105,7 @@ end
 function util.tracemc(tr)
 end
 
----@overload fun(exitno:integer):integer
+---@overload fun(exitno: integer): integer
 ---@param tr Trace
 ---@param exitno integer
 ---@return integer? addr
-- 
cgit v1.2.3


From c78d8209832652d3baaf91dc0053570501bde274 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=80=E8=90=8C=E5=B0=8F=E6=B1=90?= <sumneko@hotmail.com>
Date: Wed, 24 May 2023 14:55:42 +0800
Subject: disable ffi builder for now

---
 script/plugins/ffi/init.lua | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/script/plugins/ffi/init.lua b/script/plugins/ffi/init.lua
index a551973a..f9162e21 100644
--- a/script/plugins/ffi/init.lua
+++ b/script/plugins/ffi/init.lua
@@ -367,6 +367,8 @@ files.watch(function (ev, uri)
 end)
 
 ws.watch(function (ev, uri)
+    -- TODO
+    do return end
     if ev == 'startReload' then
         if config.get(uri, 'Lua.runtime.version') ~= 'LuaJIT' then
             return
-- 
cgit v1.2.3


From be58aaa4a2f230200968862e766cff6d48abef1d Mon Sep 17 00:00:00 2001
From: CppCXY <812125110@qq.com>
Date: Wed, 24 May 2023 15:09:07 +0800
Subject: FIX #2122

---
 3rd/EmmyLuaCodeStyle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3rd/EmmyLuaCodeStyle b/3rd/EmmyLuaCodeStyle
index edf46410..82aca211 160000
--- a/3rd/EmmyLuaCodeStyle
+++ b/3rd/EmmyLuaCodeStyle
@@ -1 +1 @@
-Subproject commit edf464104a039f15ed39d700ba5e4c3a932c786c
+Subproject commit 82aca211b6ee403a832412b9f7938db797c564d8
-- 
cgit v1.2.3


From 90cc228b936dfdcdf4a4dcf9cfd85d295bb71493 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=80=E8=90=8C=E5=B0=8F=E6=B1=90?= <sumneko@hotmail.com>
Date: Wed, 24 May 2023 18:01:21 +0800
Subject: 3.6.21

---
 changelog.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/changelog.md b/changelog.md
index b1e918cd..35c4c301 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,9 @@
 # changelog
 
+## 3.6.21
+`2023-5-24`
+* `FIX` disable ffi plugin
+
 ## 3.6.20
 `2023-5-23`
 * `NEW` support connecting by socket with `--socket=PORT`
-- 
cgit v1.2.3