1d9a4ab02c
* chore: bump node in DEPS to v18.13.0 * child_process: validate arguments for null bytes https://github.com/nodejs/node/pull/44782 * bootstrap: merge main thread and worker thread initializations https://github.com/nodejs/node/pull/44869 * module: ensure relative requires work from deleted directories https://github.com/nodejs/node/pull/42384 * src: add support for externally shared js builtins https://github.com/nodejs/node/issues/44000 * lib: disambiguate `native module` to `binding` https://github.com/nodejs/node/pull/45673 * test: convert test-debugger-pid to async/await https://github.com/nodejs/node/pull/45179 * deps: upgrade to libuv 1.44.2 https://github.com/nodejs/node/pull/42340 * src: fix cppgc incompatibility in v8 https://github.com/nodejs/node/pull/43521 * src: use qualified `std::move` call in node_http2 https://github.com/nodejs/node/pull/45555 * build: fix env.h for cpp20 https://github.com/nodejs/node/pull/45516 * test: remove experimental-wasm-threads flag https://github.com/nodejs/node/pull/45074 * src: iwyu in cleanup_queue.cc https://github.com/nodejs/node/pull/44983 * src: add missing include for `std::all_of` https://github.com/nodejs/node/pull/45541 * deps: update ICU to 72.1 https://github.com/nodejs/node/pull/45068 * chore: fixup patch indices * chore: remove errant semicolons - https://github.com/nodejs/node/pull/44179 - https://github.com/nodejs/node/pull/44193 * src: add support for externally shared js builtins https://github.com/nodejs/node/pull/44376 * chore: add missing GN filenames * deps: update nghttp2 to 1.51.0 https://github.com/nodejs/node/pull/45537 * chore: disable more Node.js snapshot tests The Snapshot feature is currently disabled * chore: disable ICU timezone tests Node.js uses a different version of ICU than Electron so they will often be out of sync. * chore: disable threadpool event tracing test Event tracing is not enabled in embedded Node.js * chore: fixup patch indices * chore: comments from review Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Shelley Vohr <shelley.vohr@gmail.com>
|
|
Date: Mon, 9 Jan 2023 13:53:36 +0100
|
|
Subject: chore: remove errant semicolons
|
|
|
|
- https://github.com/nodejs/node/pull/44179
|
|
- https://github.com/nodejs/node/pull/44193
|
|
|
|
This should be upstreamed.
|
|
|
|
diff --git a/src/node_realm.h b/src/node_realm.h
|
|
index 9ece8cb38958c364c6177118a5e7443c3a6bdf1a..0d3259a149e94b7d9657959c0ccac25a146978b4 100644
|
|
--- a/src/node_realm.h
|
|
+++ b/src/node_realm.h
|
|
@@ -55,7 +55,7 @@ class Realm : public MemoryRetainer {
|
|
Realm& operator=(Realm&&) = delete;
|
|
|
|
SET_MEMORY_INFO_NAME(Realm)
|
|
- SET_SELF_SIZE(Realm);
|
|
+ SET_SELF_SIZE(Realm)
|
|
void MemoryInfo(MemoryTracker* tracker) const override;
|
|
|
|
void CreateProperties();
|
|
diff --git a/src/node_util.h b/src/node_util.h
|
|
index 616b8c003b2d0dd80e01297ca3fe7e4926220ad7..9590842ae4764dd3363a4d74038d3351f0061177 100644
|
|
--- a/src/node_util.h
|
|
+++ b/src/node_util.h
|
|
@@ -12,7 +12,7 @@ namespace util {
|
|
|
|
class WeakReference : public SnapshotableObject {
|
|
public:
|
|
- SERIALIZABLE_OBJECT_METHODS();
|
|
+ SERIALIZABLE_OBJECT_METHODS()
|
|
|
|
static constexpr FastStringKey type_name{"node::util::WeakReference"};
|
|
static constexpr EmbedderObjectType type_int =
|