From 3652326ed281f5f753423acef51103fb8df62a6d Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Wed, 27 May 2020 21:56:34 +0100
Subject: refactor(3p/nix): Anchor local includes at src/

Previously all includes were anchored in one global mess of header
files. This moves the includes into filesystem "namespaces" (if you
will) for each sub-package of Nix.

Note: This commit does not introduce the relevant build system changes.
---
 third_party/nix/src/libmain/common-args.cc | 4 ++--
 third_party/nix/src/libmain/common-args.hh | 2 +-
 third_party/nix/src/libmain/shared.cc      | 8 ++++----
 third_party/nix/src/libmain/shared.hh      | 6 +++---
 third_party/nix/src/libmain/stack.cc       | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'third_party/nix/src/libmain')

diff --git a/third_party/nix/src/libmain/common-args.cc b/third_party/nix/src/libmain/common-args.cc
index f85eadbf70d9..0000605d454a 100644
--- a/third_party/nix/src/libmain/common-args.cc
+++ b/third_party/nix/src/libmain/common-args.cc
@@ -1,8 +1,8 @@
-#include "common-args.hh"
+#include "libmain/common-args.hh"
 
 #include <glog/logging.h>
 
-#include "globals.hh"
+#include "libstore/globals.hh"
 
 namespace nix {
 
diff --git a/third_party/nix/src/libmain/common-args.hh b/third_party/nix/src/libmain/common-args.hh
index 88b51047dfbe..f1c7c8481323 100644
--- a/third_party/nix/src/libmain/common-args.hh
+++ b/third_party/nix/src/libmain/common-args.hh
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "args.hh"
+#include "libutil/args.hh"
 
 namespace nix {
 
diff --git a/third_party/nix/src/libmain/shared.cc b/third_party/nix/src/libmain/shared.cc
index 549134872e91..3cbf59c88770 100644
--- a/third_party/nix/src/libmain/shared.cc
+++ b/third_party/nix/src/libmain/shared.cc
@@ -1,4 +1,4 @@
-#include "shared.hh"
+#include "libmain/shared.hh"
 
 #include <algorithm>
 #include <cctype>
@@ -15,9 +15,9 @@
 #include <sys/time.h>
 #include <unistd.h>
 
-#include "globals.hh"
-#include "store-api.hh"
-#include "util.hh"
+#include "libstore/globals.hh"
+#include "libstore/store-api.hh"
+#include "libutil/util.hh"
 
 namespace nix {
 
diff --git a/third_party/nix/src/libmain/shared.hh b/third_party/nix/src/libmain/shared.hh
index 60d7918931d7..b749b572c560 100644
--- a/third_party/nix/src/libmain/shared.hh
+++ b/third_party/nix/src/libmain/shared.hh
@@ -5,9 +5,9 @@
 #include <absl/strings/numbers.h>
 #include <signal.h>
 
-#include "args.hh"
-#include "common-args.hh"
-#include "util.hh"
+#include "libmain/common-args.hh"
+#include "libutil/args.hh"
+#include "libutil/util.hh"
 
 namespace nix {
 
diff --git a/third_party/nix/src/libmain/stack.cc b/third_party/nix/src/libmain/stack.cc
index f100b39156e4..c7744f69c82c 100644
--- a/third_party/nix/src/libmain/stack.cc
+++ b/third_party/nix/src/libmain/stack.cc
@@ -5,7 +5,7 @@
 
 #include <unistd.h>
 
-#include "types.hh"
+#include "libutil/types.hh"
 
 namespace nix {
 
-- 
cgit 1.4.1