Move path to src/builtins

CMakeLists.txt

@@ -92,7 +92,7 @@ set(FISH_BUILTIN_SRCS
     src/builtins/disown.cpp src/builtins/echo.cpp src/builtins/emit.cpp
     src/builtins/eval.cpp src/builtins/exit.cpp src/builtins/fg.cpp
     src/builtins/function.cpp src/builtins/functions.cpp src/builtins/history.cpp
-    src/builtins/jobs.cpp src/builtins/math.cpp src/builtins/printf.cpp src/builtin_path.cpp
+    src/builtins/jobs.cpp src/builtins/math.cpp src/builtins/printf.cpp src/builtins/path.cpp
     src/builtins/pwd.cpp src/builtins/random.cpp src/builtins/read.cpp
     src/builtins/realpath.cpp src/builtins/return.cpp src/builtins/set.cpp
     src/builtins/set_color.cpp src/builtins/source.cpp src/builtins/status.cpp

src/builtin.cpp

@@ -50,6 +50,7 @@
 #include "builtins/history.h"
 #include "builtins/jobs.h"
 #include "builtins/math.h"
+#include "builtins/path.h"
 #include "builtins/printf.h"
 #include "builtins/pwd.h"
 #include "builtins/random.h"
@@ -65,7 +66,6 @@
 #include "builtins/type.h"
 #include "builtins/ulimit.h"
 #include "builtins/wait.h"
-#include "builtin_path.h"
 #include "common.h"
 #include "complete.h"
 #include "exec.h"

src/builtins/path.cpp

@@ -10,13 +10,13 @@
 #include <utility>
 #include <vector>
 
-#include "builtin.h"
-#include "common.h"
-#include "fallback.h"  // IWYU pragma: keep
-#include "io.h"
-#include "wcstringutil.h"
-#include "wgetopt.h"
-#include "wutil.h"  // IWYU pragma: keep
+#include "../builtin.h"
+#include "../common.h"
+#include "../fallback.h"  // IWYU pragma: keep
+#include "../io.h"
+#include "../wcstringutil.h"
+#include "../wgetopt.h"
+#include "../wutil.h"  // IWYU pragma: keep
 
 // How many bytes we read() at once.
 // We use PATH_MAX here so we always get at least one path,