fbcode//hphp/compiler:compiler

Reviewed By: gcramer23

Differential Revision: D72448757

fbshipit-source-id: 850dbe1a5db5db5dc92ef973292f1c5932ec5bd3

Author: generatedunixname89002005287564

hphp/compiler/compiler-systemlib.cpp

@@ -124,7 +124,7 @@ int prepareOptions(CompilerOptions &po, int argc, char **argv) {
     std::cout << desc << "\n";
     return 1;
   }
-  if (vm.count("version")) {
+  if (vm.contains("version")) {
     std::cout << "HipHop Repo Compiler";
     std::cout << " " << HHVM_VERSION;
     std::cout << " (" << (debug ? "dbg" : "rel") << ")\n";
@@ -230,7 +230,7 @@ bool process(CompilerOptions &po) {
 
   for (auto extension : ExtensionRegistry::getExtensions()) {
     for (auto file : extension->hackFiles()) {
-      if (!files.count(file)) {
+      if (!files.contains(file)) {
         Logger::Error(
           "Error while compiling stdlib: %s not found in input files - did you add an extension without any hack files? If so, override hackFiles to return an empty vector.", file.c_str());
       }

hphp/compiler/compiler.cpp

@@ -603,7 +603,7 @@ int prepareOptions(CompilerOptions &po, int argc, char **argv) {
     std::cout << desc << "\n";
     return 1;
   }
-  if (vm.count("version")) {
+  if (vm.contains("version")) {
     std::cout << "HipHop Repo Compiler";
     std::cout << " " << HHVM_VERSION;
     std::cout << " (" << (debug ? "dbg" : "rel") << ")\n";
@@ -612,12 +612,12 @@ int prepareOptions(CompilerOptions &po, int argc, char **argv) {
     return 1;
   }
 
-  if (vm.count("compiler-id")) {
+  if (vm.contains("compiler-id")) {
     std::cout << compilerId() << "\n";
     return 1;
   }
 
-  if (vm.count("repo-schema")) {
+  if (vm.contains("repo-schema")) {
     std::cout << repoSchemaId() << "\n";
     return 1;
   }

hphp/compiler/package.cpp

@@ -864,7 +864,7 @@ coro::Task<void> Package::parseGroup(
     auto const workItems = paths.size();
     for (size_t i = 0; i < workItems; i++) {
       auto const& fileName = metas[i].m_filename;
-      if (!m_extraStaticFiles.count(fileName)) {
+      if (!m_extraStaticFiles.contains(fileName)) {
         m_discoveredStaticFiles.emplace(
           fileName,
           Option::CachePHPFile ? paths[i] : ""
@@ -1000,7 +1000,7 @@ void Package::resolveOnDemand(OndemandInfo& out,
   auto const& onPath = [&] (const std::string& rpath,
                             const StringData* sym) {
     if (rpath.empty()) return;
-    if (Option::PackageExcludeFiles.count(rpath) > 0 ||
+    if (Option::PackageExcludeFiles.contains(rpath) ||
         Option::IsFileExcluded(rpath, Option::PackageExcludePatterns)) {
       // Found symbol in UnitIndex, but the corresponding file was excluded.
       Logger::FVerbose("excluding ondemand file {}", rpath);
@@ -1757,7 +1757,7 @@ coro::Task<Package::EmitInfo> Package::emitGroup(
     auto const workItems = group.m_files.size();
     for (size_t i = 0; i < workItems; i++) {
       auto const& fileName = group.m_files[i];
-      if (!m_extraStaticFiles.count(fileName)) {
+      if (!m_extraStaticFiles.contains(fileName)) {
         m_discoveredStaticFiles.emplace(
           fileName,
           Option::CachePHPFile ? createFullPath(fileName, m_root) : ""