src: prefer OnScopeLeave over shared_ptr<void>

They do the same thing, but OnScopeLeave avoids an extra heap allocation and is more explicit about what it does. PR-URL: #32247 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Gus Caplan <[email protected]> Reviewed-By: Matheus Marchini <[email protected]>
nodejs · Apr 28, 2020 · 43e9ae8 · 43e9ae8
1 parent 742a032
commit 43e9ae8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/node_file.cc b/src/node_file.cc
@@ -821,7 +821,7 @@ static void InternalModuleReadJSON(const FunctionCallbackInfo<Value>& args) {
     return;
   }
 
-  std::shared_ptr<void> defer_close(nullptr, [fd, loop] (...) {
+  auto defer_close = OnScopeLeave([fd, loop]() {
     uv_fs_t close_req;
     CHECK_EQ(0, uv_fs_close(loop, &close_req, fd, nullptr));
     uv_fs_req_cleanup(&close_req);

diff --git a/src/node_native_module.cc b/src/node_native_module.cc
@@ -202,7 +202,7 @@ MaybeLocal<String> NativeModuleLoader::LoadBuiltinModuleSource(Isolate* isolate,
   CHECK_GE(req.result, 0);
   uv_fs_req_cleanup(&req);
 
-  std::shared_ptr<void> defer_close(nullptr, [file](...) {
+  auto defer_close = OnScopeLeave([file]() {
     uv_fs_t close_req;
     CHECK_EQ(0, uv_fs_close(nullptr, &close_req, file, nullptr));
     uv_fs_req_cleanup(&close_req);