From 5f94a84f21ea7f98f7928d2375d84faa3860ab81 Mon Sep 17 00:00:00 2001 From: CGQAQ Date: Tue, 11 Jul 2023 05:29:31 +0000 Subject: [PATCH 1/4] src: modernize use-equals-default --- src/api/environment.cc | 2 +- src/cleanup_queue.h | 2 +- src/node.cc | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/api/environment.cc b/src/api/environment.cc index 2128ca6c4ebb75..6df332491a5682 100644 --- a/src/api/environment.cc +++ b/src/api/environment.cc @@ -408,7 +408,7 @@ void FreeIsolateData(IsolateData* isolate_data) { delete isolate_data; } -InspectorParentHandle::~InspectorParentHandle() {} +InspectorParentHandle::~InspectorParentHandle() = default; // Hide the internal handle class from the public API. #if HAVE_INSPECTOR diff --git a/src/cleanup_queue.h b/src/cleanup_queue.h index 64e04e1856a197..0ea52033fb2207 100644 --- a/src/cleanup_queue.h +++ b/src/cleanup_queue.h @@ -17,7 +17,7 @@ class CleanupQueue : public MemoryRetainer { public: typedef void (*Callback)(void*); - CleanupQueue() {} + CleanupQueue() = default; // Not copyable. CleanupQueue(const CleanupQueue&) = delete; diff --git a/src/node.cc b/src/node.cc index f483e59dd155a8..3ca82841fe8799 100644 --- a/src/node.cc +++ b/src/node.cc @@ -1127,8 +1127,8 @@ void TearDownOncePerProcess() { } } -InitializationResult::~InitializationResult() {} -InitializationResultImpl::~InitializationResultImpl() {} +InitializationResult::~InitializationResult() = default; +InitializationResultImpl::~InitializationResultImpl() = default; ExitCode GenerateAndWriteSnapshotData(const SnapshotData** snapshot_data_ptr, const InitializationResultImpl* result) { From b2a9d7fb569b490ca266d1c58940d0f90ebda767 Mon Sep 17 00:00:00 2001 From: CGQAQ Date: Tue, 11 Jul 2023 07:25:03 +0000 Subject: [PATCH 2/4] src: more modernize use-equals-default --- src/blob_serializer_deserializer.h | 4 ++-- src/crypto/crypto_ec.cc | 2 +- src/inspector_agent.cc | 2 -- src/inspector_agent.h | 2 +- src/js_native_api_v8.h | 4 ++-- src/json_parser.h | 2 +- 6 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/blob_serializer_deserializer.h b/src/blob_serializer_deserializer.h index aa07bee54fd1bc..fe7989e22a3536 100644 --- a/src/blob_serializer_deserializer.h +++ b/src/blob_serializer_deserializer.h @@ -39,7 +39,7 @@ class BlobDeserializer : public BlobSerializerDeserializer { public: explicit BlobDeserializer(bool is_debug_v, std::string_view s) : BlobSerializerDeserializer(is_debug_v), sink(s) {} - ~BlobDeserializer() {} + ~BlobDeserializer() = default; size_t read_total = 0; std::string_view sink; @@ -85,7 +85,7 @@ class BlobSerializer : public BlobSerializerDeserializer { public: explicit BlobSerializer(bool is_debug_v) : BlobSerializerDeserializer(is_debug_v) {} - ~BlobSerializer() {} + ~BlobSerializer() = default; Impl* impl() { return static_cast(this); } const Impl* impl() const { return static_cast(this); } diff --git a/src/crypto/crypto_ec.cc b/src/crypto/crypto_ec.cc index 415464be04db6b..6aa88bd70e8de8 100644 --- a/src/crypto/crypto_ec.cc +++ b/src/crypto/crypto_ec.cc @@ -130,7 +130,7 @@ void ECDH::MemoryInfo(MemoryTracker* tracker) const { tracker->TrackFieldWithSize("key", key_ ? kSizeOf_EC_KEY : 0); } -ECDH::~ECDH() {} +ECDH::~ECDH() = default; void ECDH::New(const FunctionCallbackInfo& args) { Environment* env = Environment::GetCurrent(args); diff --git a/src/inspector_agent.cc b/src/inspector_agent.cc index fe1e573242f6e2..f7b10ca575da8a 100644 --- a/src/inspector_agent.cc +++ b/src/inspector_agent.cc @@ -687,8 +687,6 @@ Agent::Agent(Environment* env) debug_options_(env->options()->debug_options()), host_port_(env->inspector_host_port()) {} -Agent::~Agent() {} - bool Agent::Start(const std::string& path, const DebugOptions& options, std::shared_ptr> host_port, diff --git a/src/inspector_agent.h b/src/inspector_agent.h index 01c5f70be6f860..c03b10159cd456 100644 --- a/src/inspector_agent.h +++ b/src/inspector_agent.h @@ -43,7 +43,7 @@ class InspectorSessionDelegate { class Agent { public: explicit Agent(node::Environment* env); - ~Agent(); + ~Agent() = default; // Create client_, may create io_ if option enabled bool Start(const std::string& path, diff --git a/src/js_native_api_v8.h b/src/js_native_api_v8.h index f7646778311bfd..89d00e2292f7f1 100644 --- a/src/js_native_api_v8.h +++ b/src/js_native_api_v8.h @@ -10,8 +10,8 @@ namespace v8impl { class RefTracker { public: - RefTracker() {} - virtual ~RefTracker() {} + RefTracker() = default; + virtual ~RefTracker() = default; virtual void Finalize() {} typedef RefTracker RefList; diff --git a/src/json_parser.h b/src/json_parser.h index 555f539acf3076..3688585d2c9a1e 100644 --- a/src/json_parser.h +++ b/src/json_parser.h @@ -16,7 +16,7 @@ namespace node { class JSONParser { public: JSONParser(); - ~JSONParser() {} + ~JSONParser() = default; bool Parse(const std::string& content); std::optional GetTopLevelStringField(std::string_view field); std::optional GetTopLevelBoolField(std::string_view field); From 4cf5d59743def5d064d17cf18386a2fa9ad8ff43 Mon Sep 17 00:00:00 2001 From: CGQAQ Date: Tue, 11 Jul 2023 07:29:57 +0000 Subject: [PATCH 3/4] src: move `= default` to header file --- src/api/environment.cc | 2 -- src/crypto/crypto_ec.cc | 2 -- src/crypto/crypto_ec.h | 2 +- src/node.cc | 3 --- src/node.h | 4 ++-- src/node_internals.h | 2 +- 6 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/api/environment.cc b/src/api/environment.cc index 6df332491a5682..6a6164b6d29443 100644 --- a/src/api/environment.cc +++ b/src/api/environment.cc @@ -408,8 +408,6 @@ void FreeIsolateData(IsolateData* isolate_data) { delete isolate_data; } -InspectorParentHandle::~InspectorParentHandle() = default; - // Hide the internal handle class from the public API. #if HAVE_INSPECTOR struct InspectorParentHandleImpl : public InspectorParentHandle { diff --git a/src/crypto/crypto_ec.cc b/src/crypto/crypto_ec.cc index 6aa88bd70e8de8..b3a73f5c9d10a6 100644 --- a/src/crypto/crypto_ec.cc +++ b/src/crypto/crypto_ec.cc @@ -130,8 +130,6 @@ void ECDH::MemoryInfo(MemoryTracker* tracker) const { tracker->TrackFieldWithSize("key", key_ ? kSizeOf_EC_KEY : 0); } -ECDH::~ECDH() = default; - void ECDH::New(const FunctionCallbackInfo& args) { Environment* env = Environment::GetCurrent(args); diff --git a/src/crypto/crypto_ec.h b/src/crypto/crypto_ec.h index 9782ce0bf35a66..f9570bd41f92eb 100644 --- a/src/crypto/crypto_ec.h +++ b/src/crypto/crypto_ec.h @@ -20,7 +20,7 @@ int GetOKPCurveFromName(const char* name); class ECDH final : public BaseObject { public: - ~ECDH() override; + ~ECDH() override = default; static void Initialize(Environment* env, v8::Local target); static void RegisterExternalReferences(ExternalReferenceRegistry* registry); diff --git a/src/node.cc b/src/node.cc index 3ca82841fe8799..aa9c4746a011d0 100644 --- a/src/node.cc +++ b/src/node.cc @@ -1127,9 +1127,6 @@ void TearDownOncePerProcess() { } } -InitializationResult::~InitializationResult() = default; -InitializationResultImpl::~InitializationResultImpl() = default; - ExitCode GenerateAndWriteSnapshotData(const SnapshotData** snapshot_data_ptr, const InitializationResultImpl* result) { ExitCode exit_code = result->exit_code_enum(); diff --git a/src/node.h b/src/node.h index 846ec413f8e1fc..c560ace29bd2fe 100644 --- a/src/node.h +++ b/src/node.h @@ -285,7 +285,7 @@ enum Flags : uint32_t { class NODE_EXTERN InitializationResult { public: - virtual ~InitializationResult(); + virtual ~InitializationResult() = default; // Returns a suggested process exit code. virtual int exit_code() const = 0; @@ -654,7 +654,7 @@ enum Flags : uint64_t { } // namespace EnvironmentFlags struct InspectorParentHandle { - virtual ~InspectorParentHandle(); + virtual ~InspectorParentHandle() = default; }; // TODO(addaleax): Maybe move per-Environment options parsing here. diff --git a/src/node_internals.h b/src/node_internals.h index 9243344eb788b5..d7f78664615fcf 100644 --- a/src/node_internals.h +++ b/src/node_internals.h @@ -318,7 +318,7 @@ void MarkBootstrapComplete(const v8::FunctionCallbackInfo& args); class InitializationResultImpl final : public InitializationResult { public: - ~InitializationResultImpl(); + ~InitializationResultImpl() = default; int exit_code() const { return static_cast(exit_code_enum()); } ExitCode exit_code_enum() const { return exit_code_; } bool early_return() const { return early_return_; } From d9ce897e1d2b093a1d9eaf9bb28d86db12f3868a Mon Sep 17 00:00:00 2001 From: CGQAQ Date: Wed, 12 Jul 2023 07:24:52 +0000 Subject: [PATCH 4/4] src: fix build --- src/inspector_agent.cc | 2 ++ src/inspector_agent.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/inspector_agent.cc b/src/inspector_agent.cc index f7b10ca575da8a..f0b4cc43c864ae 100644 --- a/src/inspector_agent.cc +++ b/src/inspector_agent.cc @@ -687,6 +687,8 @@ Agent::Agent(Environment* env) debug_options_(env->options()->debug_options()), host_port_(env->inspector_host_port()) {} +Agent::~Agent() = default; + bool Agent::Start(const std::string& path, const DebugOptions& options, std::shared_ptr> host_port, diff --git a/src/inspector_agent.h b/src/inspector_agent.h index c03b10159cd456..01c5f70be6f860 100644 --- a/src/inspector_agent.h +++ b/src/inspector_agent.h @@ -43,7 +43,7 @@ class InspectorSessionDelegate { class Agent { public: explicit Agent(node::Environment* env); - ~Agent() = default; + ~Agent(); // Create client_, may create io_ if option enabled bool Start(const std::string& path,