From 574d25642fc9ca65b396633aeab6e2d32778b642 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 27 Nov 2023 17:21:58 +0800
Subject: refactor: move Arena and ArenaMem to memory_defs.h (#26240)

---
 src/nvim/eval/buffer.h   | 5 +++--
 src/nvim/eval/decode.h   | 6 +++---
 src/nvim/eval/executor.h | 2 +-
 src/nvim/eval/gc.h       | 2 +-
 src/nvim/eval/typval.c   | 2 +-
 src/nvim/eval/userfunc.c | 2 +-
 src/nvim/eval/vars.h     | 9 +++++++--
 7 files changed, 17 insertions(+), 11 deletions(-)

(limited to 'src/nvim/eval')

diff --git a/src/nvim/eval/buffer.h b/src/nvim/eval/buffer.h
index fdd146885a..b0fc0f9208 100644
--- a/src/nvim/eval/buffer.h
+++ b/src/nvim/eval/buffer.h
@@ -1,7 +1,8 @@
 #pragma once
 
-#include "nvim/buffer_defs.h"
-#include "nvim/eval/typval_defs.h"
+#include "nvim/buffer_defs.h"  // IWYU pragma: keep
+#include "nvim/eval/typval_defs.h"  // IWYU pragma: keep
+#include "nvim/types.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "eval/buffer.h.generated.h"
diff --git a/src/nvim/eval/decode.h b/src/nvim/eval/decode.h
index 3000cd3211..b80786bc32 100644
--- a/src/nvim/eval/decode.h
+++ b/src/nvim/eval/decode.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <msgpack.h>
-#include <stddef.h>
+#include <msgpack.h>  // IWYU pragma: keep
+#include <stddef.h>  // IWYU pragma: keep
 
-#include "nvim/eval/typval_defs.h"
+#include "nvim/eval/typval_defs.h"  // IWYU pragma: keep
 #include "nvim/types.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
diff --git a/src/nvim/eval/executor.h b/src/nvim/eval/executor.h
index 58edf7216b..d36ce08542 100644
--- a/src/nvim/eval/executor.h
+++ b/src/nvim/eval/executor.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "nvim/eval/typval_defs.h"
+#include "nvim/eval/typval_defs.h"  // IWYU pragma: keep
 
 extern char *e_list_index_out_of_range_nr;
 
diff --git a/src/nvim/eval/gc.h b/src/nvim/eval/gc.h
index ea91952fff..36149ec060 100644
--- a/src/nvim/eval/gc.h
+++ b/src/nvim/eval/gc.h
@@ -6,5 +6,5 @@ extern dict_T *gc_first_dict;
 extern list_T *gc_first_list;
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "eval/gc.h.generated.h"
+# include "eval/gc.h.generated.h"  // IWYU pragma: export
 #endif
diff --git a/src/nvim/eval/typval.c b/src/nvim/eval/typval.c
index a0329221d5..e8ed6e5d32 100644
--- a/src/nvim/eval/typval.c
+++ b/src/nvim/eval/typval.c
@@ -1,11 +1,11 @@
 #include <assert.h>
+#include <lauxlib.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "lauxlib.h"
 #include "nvim/ascii.h"
 #include "nvim/assert.h"
 #include "nvim/charset.h"
diff --git a/src/nvim/eval/userfunc.c b/src/nvim/eval/userfunc.c
index cd1ee94298..13d1290fa2 100644
--- a/src/nvim/eval/userfunc.c
+++ b/src/nvim/eval/userfunc.c
@@ -3,11 +3,11 @@
 #include <assert.h>
 #include <ctype.h>
 #include <inttypes.h>
+#include <lauxlib.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "lauxlib.h"
 #include "nvim/ascii.h"
 #include "nvim/autocmd.h"
 #include "nvim/charset.h"
diff --git a/src/nvim/eval/vars.h b/src/nvim/eval/vars.h
index 124d73825b..646c6f24e3 100644
--- a/src/nvim/eval/vars.h
+++ b/src/nvim/eval/vars.h
@@ -1,7 +1,12 @@
 #pragma once
 
-#include "nvim/ex_cmds_defs.h"
-#include "nvim/option_defs.h"
+#include <stddef.h>  // IWYU pragma: keep
+
+#include "nvim/ex_cmds_defs.h"  // IWYU pragma: keep
+#include "nvim/garray_defs.h"  // IWYU pragma: keep
+#include "nvim/hashtab.h"
+#include "nvim/option_defs.h"  // IWYU pragma: keep
+#include "nvim/types.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "eval/vars.h.generated.h"
-- 
cgit