From 479c0c59bcb284d4b57b5a826d6864414afd661a Mon Sep 17 00:00:00 2001
From: Fangrui Song <i@maskray.me>
Date: Sun, 10 Dec 2017 18:59:32 -0800
Subject: [PATCH] More idiomatic

---
 src/indexer.cc | 20 ++++++++++----------
 src/utils.h    |  3 +--
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/indexer.cc b/src/indexer.cc
index b687856d..b4bb7cd4 100644
--- a/src/indexer.cc
+++ b/src/indexer.cc
@@ -1657,8 +1657,10 @@ std::vector<std::unique_ptr<IndexFile>> ParseWithTu(
     // Update dependencies for the file. Do not include the file in its own
     // dependency set.
     entry->dependencies = param.seen_files;
-    entry->dependencies.erase(std::find(
-        entry->dependencies.begin(), entry->dependencies.end(), entry->path));
+    entry->dependencies.erase(
+        std::remove(entry->dependencies.begin(), entry->dependencies.end(),
+                    entry->path),
+        entry->dependencies.end());
 
     // Make sure we are using correct file contents.
     for (const CXUnsavedFile& contents : file_contents) {
@@ -1694,14 +1696,12 @@ void ClangSanityCheck() {
                                 void* reserved) -> CXIdxClientFile {
     return nullptr;
   };
-  callback.ppIncludedFile =
-      [](CXClientData client_data,
-         const CXIdxIncludedFileInfo* file) -> CXIdxClientFile {
-    return nullptr;
-  };
-  callback.importedASTFile =
-      [](CXClientData client_data,
-         const CXIdxImportedASTFileInfo*) -> CXIdxClientASTFile {
+  callback.ppIncludedFile = [](
+      CXClientData client_data,
+      const CXIdxIncludedFileInfo* file) -> CXIdxClientFile { return nullptr; };
+  callback.importedASTFile = [](
+      CXClientData client_data,
+      const CXIdxImportedASTFileInfo*) -> CXIdxClientASTFile {
     return nullptr;
   };
   callback.startedTranslationUnit = [](CXClientData client_data,
diff --git a/src/utils.h b/src/utils.h
index 0a4a8198..197f9bbb 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -98,8 +98,7 @@ std::unique_ptr<T> MakeUnique(Args&&... args) {
 
 template <typename T>
 void AddRange(std::vector<T>* dest, const std::vector<T>& to_add) {
-  for (const T& e : to_add)
-    dest->push_back(e);
+  dest->insert(dest->end(), to_add.begin(), to_add.end());
 }
 
 template <typename T>