From 17a8dd8f6293d62e63f00097a4abcd53f0027305 Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Wed, 17 Nov 2021 20:22:21 +0100
Subject: [PATCH] Move path to src/builtins

---
 CMakeLists.txt                              |  2 +-
 src/builtin.cpp                             |  2 +-
 src/{builtin_path.cpp => builtins/path.cpp} | 14 +++++++-------
 src/{builtin_path.h => builtins/path.h}     |  0
 4 files changed, 9 insertions(+), 9 deletions(-)
 rename src/{builtin_path.cpp => builtins/path.cpp} (99%)
 rename src/{builtin_path.h => builtins/path.h} (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 04d4f39a7..2e90030bb 100644
--- a/CMakeLists.txt
+++ b/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
diff --git a/src/builtin.cpp b/src/builtin.cpp
index 007aa12f8..f60ae17cc 100644
--- a/src/builtin.cpp
+++ b/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"
diff --git a/src/builtin_path.cpp b/src/builtins/path.cpp
similarity index 99%
rename from src/builtin_path.cpp
rename to src/builtins/path.cpp
index 76e12001c..078c66f68 100644
--- a/src/builtin_path.cpp
+++ b/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,
diff --git a/src/builtin_path.h b/src/builtins/path.h
similarity index 100%
rename from src/builtin_path.h
rename to src/builtins/path.h