Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

src: cleanup unused headers #30328

Closed
wants to merge 8 commits into from
Closed

src: cleanup unused headers #30328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
01d3211
src: cleanup unused headers
alferpal Nov 7, 2019
a33c48d
src: remove unnecessary v8 forward declarations
alferpal Nov 8, 2019
4200839
src: add missing namespace comment
alferpal Nov 10, 2019
f28b8c4
src: include env-inl in string_bytes
alferpal Nov 10, 2019
77d07ce
src: remove unnecessary forward declarations
alferpal Nov 12, 2019
240ba7d
src: include base_object in module_wrap.h
alferpal Nov 12, 2019
d7f2f40
src: fix build errors on macos
alferpal Nov 26, 2019
db5d6f1
src: remove unused header added by mistake
alferpal Nov 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/api/encoding.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#include "node.h"
#include "env-inl.h"
#include "string_bytes.h"
#include "util-inl.h"
#include "v8.h"
Expand Down
2 changes: 0 additions & 2 deletions src/api/utils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
#include "node.h"
#include "node_internals.h"
#include "util-inl.h"

#include <csignal>

Expand Down
1 change: 0 additions & 1 deletion src/async_wrap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
#include "util-inl.h"

#include "v8.h"
#include "v8-profiler.h"

using v8::Context;
using v8::DontDelete;
Expand Down
4 changes: 1 addition & 3 deletions src/connect_wrap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
#include "connect_wrap.h"

#include "env-inl.h"
#include "req_wrap-inl.h"
#include "util-inl.h"

namespace node {

using v8::Local;
using v8::Object;

class Environment;

ConnectWrap::ConnectWrap(Environment* env,
Local<Object> req_wrap_obj,
Expand Down
2 changes: 0 additions & 2 deletions src/connect_wrap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@

#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS

#include "env.h"
#include "req_wrap-inl.h"
#include "async_wrap.h"
#include "v8.h"

namespace node {

Expand Down
1 change: 0 additions & 1 deletion src/connection_wrap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS

#include "stream_wrap.h"
#include "v8.h"

namespace node {

Expand Down
1 change: 0 additions & 1 deletion src/debug_utils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#include "debug_utils.h"
#include "env-inl.h"
#include "util-inl.h"

#ifdef __POSIX__
#if defined(__linux__)
Expand Down
1 change: 0 additions & 1 deletion src/env.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include "node_errors.h"
#include "node_file.h"
#include "node_internals.h"
#include "node_native_module.h"
#include "node_options-inl.h"
#include "node_process.h"
#include "node_v8_platform-inl.h"
Expand Down
1 change: 0 additions & 1 deletion src/fs_event_wrap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@

#include "async_wrap-inl.h"
#include "env-inl.h"
#include "util-inl.h"
#include "node.h"
#include "handle_wrap.h"
#include "string_bytes.h"
Expand Down
1 change: 0 additions & 1 deletion src/handle_wrap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#include "async_wrap-inl.h"
#include "env-inl.h"
#include "util-inl.h"
#include "node.h"

namespace node {

Expand Down
1 change: 0 additions & 1 deletion src/js_stream.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

#include "async_wrap.h"
#include "env-inl.h"
#include "node_buffer.h"
#include "node_errors.h"
#include "stream_base-inl.h"
#include "util-inl.h"
Expand Down
1 change: 0 additions & 1 deletion src/js_stream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

#include "async_wrap.h"
#include "stream_base.h"
#include "v8.h"

namespace node {

Expand Down
6 changes: 4 additions & 2 deletions src/module_wrap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@
#include <unordered_map>
#include <string>
#include <vector>
#include "node_url.h"
#include "base_object-inl.h"
#include "base_object.h"

namespace node {

class Environment;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

base_object-inl.h is guaranteed to have a forward declaration of this because it uses it as a return type… however, it’s not great that base_object-inl.h is included here rather than base_object.h. Can we replace it with the latter?


namespace loader {

enum ScriptType : int {
Expand Down
3 changes: 0 additions & 3 deletions src/node_binding.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
#include "node.h"
#define NAPI_EXPERIMENTAL
#include "node_api.h"
#include "util.h"
#include "uv.h"
#include "v8.h"

enum {
NM_F_BUILTIN = 1 << 0, // Unused.
Expand Down
1 change: 0 additions & 1 deletion src/node_buffer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
#include "string_bytes.h"
#include "string_search.h"
#include "util-inl.h"
#include "v8-profiler.h"
#include "v8.h"

#include <cstring>
Expand Down
2 changes: 0 additions & 2 deletions src/node_errors.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS

#include "node.h"
#include "util.h"
#include "env.h"
#include "v8.h"

Expand Down
1 change: 0 additions & 1 deletion src/node_watchdog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS

#include "v8.h"
#include "uv.h"
#include "node_mutex.h"
#include <vector>
Expand Down
1 change: 0 additions & 1 deletion src/stream_wrap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@

#include "stream_base.h"
#include "handle_wrap.h"
#include "string_bytes.h"
#include "v8.h"

namespace node {
Expand Down
2 changes: 1 addition & 1 deletion src/string_bytes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
// Decodes a v8::Local<v8::String> or Buffer to a raw char*

#include "v8.h"
#include "env.h"
#include "env-inl.h"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you explain why this is necessary? If an inline function here uses an inline function from env.h, then it’s probably best to either make it non-inline and move it to the .cc file, or create a string_bytes-inl.h that defines that function and includes env-inl.h?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The more I think of it, it's probably not necessary and an over reaction on my side to this CI error on osx https://ci.nodejs.org/job/node-test-commit-osx/29819/nodes=osx1011/console

Why would only that build fail for that particular reason still leaves me puzzled

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah… I don’t know either, but I think it makes sense to move StringBytes::InlineDecoder::Decode() into a string_bytes-inl.h?


namespace node {

Expand Down
1 change: 0 additions & 1 deletion src/string_decoder-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS

#include "string_decoder.h"
#include "util.h"

namespace node {

Expand Down
6 changes: 5 additions & 1 deletion src/tracing/agent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

#include "libplatform/v8-tracing.h"
#include "uv.h"
#include "v8.h"
#include "util.h"
#include "node_mutex.h"

Expand All @@ -12,6 +11,11 @@
#include <string>
#include <unordered_map>

namespace v8 {
class ConvertableToTraceFormat;
class TracingController;
} // namespace v8

namespace node {
namespace tracing {

Expand Down
1 change: 0 additions & 1 deletion src/udp_wrap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS

#include "async_wrap.h"
#include "handle_wrap.h"
#include "uv.h"
#include "v8.h"
Expand Down