src: use C++20 contains() method

iknoom · aduh95 · commit 133d410cd9cb · 2025-08-26T11:22:38.000+02:00
Refactors several `v.find(...) == v.end()` and `v.find(...) != v.end()` to use more expressive and readable C++20 `contains()` method. PR-URL: #59304 Reviewed-By: Zeyu "Alex" Yang <himself65@outlook.com> Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
diff --git a/src/inspector/io_agent.cc b/src/inspector/io_agent.cc
@@ -27,7 +27,7 @@ DispatchResponse IoAgent::read(const String& in_handle,
   if (in_offset.has_value()) {
     offset = *in_offset;
     offset_was_specified = true;
-  } else if (offset_map_.find(url) != offset_map_.end()) {
+  } else if (offset_map_.contains(url)) {
     offset = offset_map_[url];
   }
   int size = 1 << 20;
diff --git a/src/inspector_profiler.h b/src/inspector_profiler.h
@@ -65,9 +65,7 @@ class V8ProfilerConnection {
       simdjson::ondemand::object* result);
   virtual void WriteProfile(simdjson::ondemand::object* result);
 
-  bool HasProfileId(uint64_t id) const {
-    return profile_ids_.find(id) != profile_ids_.end();
-  }
+  bool HasProfileId(uint64_t id) const { return profile_ids_.contains(id); }
 
   void RemoveProfileId(uint64_t id) { profile_ids_.erase(id); }
 
diff --git a/src/node_blob.cc b/src/node_blob.cc
@@ -534,11 +534,11 @@ void BlobBindingData::store_data_object(
 }
 
 void BlobBindingData::revoke_data_object(const std::string& uuid) {
-  if (data_objects_.find(uuid) == data_objects_.end()) {
+  if (!data_objects_.contains(uuid)) {
     return;
   }
   data_objects_.erase(uuid);
-  CHECK_EQ(data_objects_.find(uuid), data_objects_.end());
+  CHECK(!data_objects_.contains(uuid));
 }
 
 BlobBindingData::StoredDataObject BlobBindingData::get_data_object(
diff --git a/src/node_builtins.cc b/src/node_builtins.cc
@@ -307,7 +307,7 @@ MaybeLocal<Function> BuiltinLoader::LookupAndCompileInternal(
   if (should_eager_compile_) {
     options = ScriptCompiler::kEagerCompile;
   } else if (!to_eager_compile_.empty()) {
-    if (to_eager_compile_.find(id) != to_eager_compile_.end()) {
+    if (to_eager_compile_.contains(id)) {
       options = ScriptCompiler::kEagerCompile;
     }
   }
diff --git a/src/node_env_var.cc b/src/node_env_var.cc
@@ -258,7 +258,7 @@ void MapKVStore::Set(Isolate* isolate, Local<String> key, Local<String> value) {
 
 int32_t MapKVStore::Query(const char* key) const {
   Mutex::ScopedLock lock(mutex_);
-  return map_.find(key) == map_.end() ? -1 : 0;
+  return map_.contains(key) ? 0 : -1;
 }
 
 int32_t MapKVStore::Query(Isolate* isolate, Local<String> key) const {
diff --git a/src/node_messaging.cc b/src/node_messaging.cc
@@ -1508,7 +1508,7 @@ Maybe<bool> SiblingGroup::Dispatch(
   RwLock::ScopedReadLock lock(group_mutex_);
 
   // The source MessagePortData is not part of this group.
-  if (ports_.find(source) == ports_.end()) {
+  if (!ports_.contains(source)) {
     if (error != nullptr)
       *error = "Source MessagePort is not entangled with this group.";
     return Nothing<bool>();
diff --git a/src/signal_wrap.cc b/src/signal_wrap.cc
@@ -170,7 +170,7 @@ void DecreaseSignalHandlerCount(int signum) {
 
 bool HasSignalJSHandler(int signum) {
   Mutex::ScopedLock lock(handled_signals_mutex);
-  return handled_signals.find(signum) != handled_signals.end();
+  return handled_signals.contains(signum);
 }
 }  // namespace node
 

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ DispatchResponse IoAgent::read(const String& in_handle,`
`27`	`27`	`if (in_offset.has_value()) {`
`28`	`28`	`offset = *in_offset;`
`29`	`29`	`offset_was_specified = true;`
`30`		`- } else if (offset_map_.find(url) != offset_map_.end()) {`
	`30`	`+ } else if (offset_map_.contains(url)) {`
`31`	`31`	`offset = offset_map_[url];`
`32`	`32`	`}`
`33`	`33`	`int size = 1 << 20;`
Original file line number	Diff line number	Diff line change
`@@ -534,11 +534,11 @@ void BlobBindingData::store_data_object(`
`534`	`534`	`}`
`535`	`535`
`536`	`536`	`void BlobBindingData::revoke_data_object(const std::string& uuid) {`
`537`		`- if (data_objects_.find(uuid) == data_objects_.end()) {`
	`537`	`+ if (!data_objects_.contains(uuid)) {`
`538`	`538`	`return;`
`539`	`539`	`}`
`540`	`540`	`data_objects_.erase(uuid);`
`541`		`- CHECK_EQ(data_objects_.find(uuid), data_objects_.end());`
	`541`	`+ CHECK(!data_objects_.contains(uuid));`
`542`	`542`	`}`
`543`	`543`
`544`	`544`	`BlobBindingData::StoredDataObject BlobBindingData::get_data_object(`
Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ MaybeLocal<Function> BuiltinLoader::LookupAndCompileInternal(`
`307`	`307`	`if (should_eager_compile_) {`
`308`	`308`	`options = ScriptCompiler::kEagerCompile;`
`309`	`309`	`} else if (!to_eager_compile_.empty()) {`
`310`		`- if (to_eager_compile_.find(id) != to_eager_compile_.end()) {`
	`310`	`+ if (to_eager_compile_.contains(id)) {`
`311`	`311`	`options = ScriptCompiler::kEagerCompile;`
`312`	`312`	`}`
`313`	`313`	`}`
Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ void MapKVStore::Set(Isolate* isolate, Local<String> key, Local<String> value) {`
`258`	`258`
`259`	`259`	`int32_t MapKVStore::Query(const char* key) const {`
`260`	`260`	`Mutex::ScopedLock lock(mutex_);`
`261`		`- return map_.find(key) == map_.end() ? -1 : 0;`
	`261`	`+ return map_.contains(key) ? 0 : -1;`
`262`	`262`	`}`
`263`	`263`
`264`	`264`	`int32_t MapKVStore::Query(Isolate* isolate, Local<String> key) const {`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ void DecreaseSignalHandlerCount(int signum) {`
`170`	`170`
`171`	`171`	`bool HasSignalJSHandler(int signum) {`
`172`	`172`	`Mutex::ScopedLock lock(handled_signals_mutex);`
`173`		`- return handled_signals.find(signum) != handled_signals.end();`
	`173`	`+ return handled_signals.contains(signum);`
`174`	`174`	`}`
`175`	`175`	`} // namespace node`
`176`	`176`