src: remove env-inl.h from header files

sam-github · targos · commit d774ea5ccece · 2019-05-28T07:33:28.000+02:00
Inline headers should only be included into the .cc files that use them. PR-URL: #27755 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/src/api/environment.cc b/src/api/environment.cc
@@ -1,4 +1,4 @@
-#include "env.h"
+#include "env-inl.h"
 #include "node.h"
 #include "node_context_data.h"
 #include "node_errors.h"
diff --git a/src/api/utils.cc b/src/api/utils.cc
@@ -1,3 +1,4 @@
+#include "env-inl.h"
 #include "node.h"
 #include "node_internals.h"
 #include "util-inl.h"
diff --git a/src/debug_utils.cc b/src/debug_utils.cc
@@ -1,4 +1,5 @@
 #include "debug_utils.h"
+#include "env-inl.h"
 #include "util-inl.h"
 
 #ifdef __POSIX__
diff --git a/src/debug_utils.h b/src/debug_utils.h
@@ -4,7 +4,7 @@
 #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 
 #include "async_wrap.h"
-#include "env-inl.h"
+#include "env.h"
 
 #include <sstream>
 #include <string>
diff --git a/src/inspector_agent.cc b/src/inspector_agent.cc
@@ -1,5 +1,6 @@
 #include "inspector_agent.h"
 
+#include "env-inl.h"
 #include "inspector/main_thread_interface.h"
 #include "inspector/node_string.h"
 #include "inspector/runtime_agent.h"
diff --git a/src/js_native_api_v8.cc b/src/js_native_api_v8.cc
@@ -2,6 +2,7 @@
 #include <cmath>
 #include <algorithm>
 #define NAPI_EXPERIMENTAL
+#include "env-inl.h"
 #include "js_native_api_v8.h"
 #include "js_native_api.h"
 #include "util-inl.h"
diff --git a/src/node_api.cc b/src/node_api.cc
@@ -1,5 +1,5 @@
 #include <node_buffer.h>
-#include "env.h"
+#include "env-inl.h"
 #define NAPI_EXPERIMENTAL
 #include "js_native_api_v8.h"
 #include "node_api.h"
diff --git a/src/node_constants.cc b/src/node_constants.cc
@@ -19,6 +19,7 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+#include "env-inl.h"
 #include "node_constants.h"
 #include "node_internals.h"
 #include "util-inl.h"
diff --git a/src/node_credentials.cc b/src/node_credentials.cc
@@ -1,3 +1,4 @@
+#include "env-inl.h"
 #include "node_internals.h"
 #include "util-inl.h"
 
diff --git a/src/node_internals.h b/src/node_internals.h
@@ -24,7 +24,7 @@
 
 #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 
-#include "env-inl.h"
+#include "env.h"
 #include "node.h"
 #include "node_binding.h"
 #include "node_mutex.h"
diff --git a/src/node_report.cc b/src/node_report.cc
@@ -1,3 +1,4 @@
+#include "env-inl.h"
 #include "node_report.h"
 #include "debug_utils.h"
 #include "node_internals.h"
diff --git a/src/node_report_utils.cc b/src/node_report_utils.cc
@@ -1,3 +1,4 @@
+#include "env-inl.h"
 #include "node_internals.h"
 #include "node_report.h"
 #include "util-inl.h"
diff --git a/src/node_url.h b/src/node_url.h
@@ -4,7 +4,7 @@
 #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 
 #include "node.h"
-#include "env-inl.h"
+#include "env.h"
 
 #include <string>
 
diff --git a/src/node_watchdog.cc b/src/node_watchdog.cc
@@ -19,11 +19,13 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "node_watchdog.h"
 #include <algorithm>
+
 #include "debug_utils.h"
+#include "env-inl.h"
 #include "node_errors.h"
 #include "node_internals.h"
+#include "node_watchdog.h"
 #include "util-inl.h"
 
 namespace node {
diff --git a/src/util.cc b/src/util.cc
@@ -22,6 +22,7 @@
 #include "util.h" // NOLINT(build/include_inline)
 #include "util-inl.h"
 
+#include "env-inl.h"
 #include "node_buffer.h"
 #include "node_errors.h"
 #include "node_internals.h"
diff --git a/test/cctest/node_test_fixture.h b/test/cctest/node_test_fixture.h
@@ -7,7 +7,7 @@
 #include "node.h"
 #include "node_platform.h"
 #include "node_internals.h"
-#include "env.h"
+#include "env-inl.h"
 #include "util-inl.h"
 #include "v8.h"
 #include "libplatform/libplatform.h"
diff --git a/test/cctest/test_aliased_buffer.cc b/test/cctest/test_aliased_buffer.cc
@@ -1,4 +1,3 @@
-
 #include "v8.h"
 #include "aliased_buffer.h"
 #include "node_test_fixture.h"
diff --git a/test/cctest/test_url.cc b/test/cctest/test_url.cc
@@ -1,5 +1,6 @@
 #include "node_url.h"
 #include "node_i18n.h"
+#include "util-inl.h"
 
 #include "gtest/gtest.h"
 
diff --git a/tools/js2c.py b/tools/js2c.py
@@ -177,6 +177,7 @@ def ReadMacros(macro_files):
 
 
 TEMPLATE = """
+#include "env-inl.h"
 #include "node_native_module.h"
 #include "node_internals.h"
 
diff --git a/tools/snapshot/node_mksnapshot.cc b/tools/snapshot/node_mksnapshot.cc
@@ -5,9 +5,11 @@
 #include <string>
 #include <vector>
 
+#include "env-inl.h"
 #include "libplatform/libplatform.h"
 #include "node_internals.h"
 #include "snapshot_builder.h"
+#include "util-inl.h"
 #include "v8.h"
 
 #ifdef _WIN32

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include"env.h"`
	`1`	`+#include"env-inl.h"`
`2`	`2`	`#include"node.h"`
`3`	`3`	`#include"node_context_data.h"`
`4`	`4`	`#include"node_errors.h"`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#include"env-inl.h"`
`1`	`2`	`#include"node.h"`
`2`	`3`	`#include"node_internals.h"`
`3`	`4`	`#include"util-inl.h"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#include"debug_utils.h"`
	`2`	`+#include"env-inl.h"`
`2`	`3`	`#include"util-inl.h"`
`3`	`4`
`4`	`5`	`#ifdef __POSIX__`
-Original file line number
+Diff line change
 #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 #include"async_wrap.h"
 -#include"env-inl.h"
 +#include"env.h"
 #include<sstream>
 #include<string>
-Original file line number
+Diff line change
@@ @@ -1,5 +1,6 @@ @@
 #include"inspector_agent.h"
 +#include"env-inl.h"
 #include"inspector/main_thread_interface.h"
 #include"inspector/node_string.h"
 #include"inspector/runtime_agent.h"
-Original file line number
+Diff line change
 #include<cmath>
 #include<algorithm>
 #defineNAPI_EXPERIMENTAL
 +#include"env-inl.h"
 #include"js_native_api_v8.h"
 #include"js_native_api.h"
 #include"util-inl.h"