Fix IncludeInserter to allow for more than one added header per file.

Also adapt tests a bit to make it possible to test this. Removed
checking the number of errors reported per test. It was never actually
checked and doesn't seem particularly relevant to the test itself.

llvm-svn: 245500

1 files changed, 2 insertions, 3 deletions

diff --git a/clang-tools-extra/clang-tidy/utils/IncludeInserter.cpp b/clang-tools-extra/clang-tidy/utils/IncludeInserter.cpp
index e0b977386d8..8f4bee6ad90 100644
--- a/clang-tools-extra/clang-tidy/utils/IncludeInserter.cpp
+++ b/clang-tools-extra/clang-tidy/utils/IncludeInserter.cpp
@@ -49,10 +49,9 @@ IncludeInserter::CreateIncludeInsertion(FileID FileID, StringRef Header,
                                         bool IsAngled) {
   // We assume the same Header will never be included both angled and not
   // angled.
-  if (!InsertedHeaders.insert(std::make_pair(FileID, std::set<std::string>()))
-           .second) {
+  if (!InsertedHeaders[FileID].insert(Header).second)
     return llvm::None;
-  }
+
   if (IncludeSorterByFile.find(FileID) == IncludeSorterByFile.end()) {
     // This may happen if there have been no preprocessor directives in this
     // file.