From 4f3c0e27b6f5ea2d512689768ece7e23e48c79a6 Mon Sep 17 00:00:00 2001
From: Benjamin Kramer <benny.kra@googlemail.com>
Date: Tue, 11 Sep 2018 10:37:08 +0000
Subject: [PATCH] [clang-tidy] Add a missing comma after "flags"

llvm-svn: 341925
---
 clang-tools-extra/clang-tidy/abseil/AbseilMatcher.h   | 19 +++++--------------
 .../test/clang-tidy/Inputs/absl/flags/internal-file.h |  1 +
 .../clang-tidy/Inputs/absl/strings/internal-file.h    |  2 --
 .../clang-tidy/abseil-no-internal-dependencies.cpp    |  1 +
 4 files changed, 7 insertions(+), 16 deletions(-)
 create mode 100644 clang-tools-extra/test/clang-tidy/Inputs/absl/flags/internal-file.h

diff --git a/clang-tools-extra/clang-tidy/abseil/AbseilMatcher.h b/clang-tools-extra/clang-tidy/abseil/AbseilMatcher.h
index 0426790..e567204 100644
--- a/clang-tools-extra/clang-tidy/abseil/AbseilMatcher.h
+++ b/clang-tools-extra/clang-tidy/abseil/AbseilMatcher.h
@@ -43,24 +43,15 @@ AST_POLYMORPHIC_MATCHER(
   // Determine whether filepath contains "absl/[absl-library]" substring, where
   // [absl-library] is AbseilLibraries list entry.
   StringRef Path = FileEntry->getName();
-  const static llvm::SmallString<5> AbslPrefix("absl/");
+  static constexpr llvm::StringLiteral AbslPrefix("absl/");
   size_t PrefixPosition = Path.find(AbslPrefix);
   if (PrefixPosition == StringRef::npos)
     return false;
   Path = Path.drop_front(PrefixPosition + AbslPrefix.size());
-  static const char *AbseilLibraries[] = {"algorithm",
-                                          "base",
-                                          "container",
-                                          "debugging",
-                                          "flags"
-                                          "memory",
-                                          "meta",
-                                          "numeric",
-                                          "strings",
-                                          "synchronization",
-                                          "time",
-                                          "types",
-                                          "utility"};
+  static const char *AbseilLibraries[] = {
+      "algorithm", "base",  "container", "debugging", "flags",
+      "memory",    "meta",  "numeric",   "strings",   "synchronization",
+      "time",      "types", "utility"};
   return std::any_of(
       std::begin(AbseilLibraries), std::end(AbseilLibraries),
       [&](const char *Library) { return Path.startswith(Library); });
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/absl/flags/internal-file.h b/clang-tools-extra/test/clang-tidy/Inputs/absl/flags/internal-file.h
new file mode 100644
index 0000000..c81cf9e
--- /dev/null
+++ b/clang-tools-extra/test/clang-tidy/Inputs/absl/flags/internal-file.h
@@ -0,0 +1 @@
+#define USE_INTERNAL(x) absl::strings_internal::Internal##x()
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/absl/strings/internal-file.h b/clang-tools-extra/test/clang-tidy/Inputs/absl/strings/internal-file.h
index ac52109..6014278 100644
--- a/clang-tools-extra/test/clang-tidy/Inputs/absl/strings/internal-file.h
+++ b/clang-tools-extra/test/clang-tidy/Inputs/absl/strings/internal-file.h
@@ -31,5 +31,3 @@ class FriendUsageInternal {
 namespace absl {
 void OpeningNamespaceInternally() { strings_internal::InternalFunction(); }
 } // namespace absl
-
-#define USE_INTERNAL(x) absl::strings_internal::Internal##x()
diff --git a/clang-tools-extra/test/clang-tidy/abseil-no-internal-dependencies.cpp b/clang-tools-extra/test/clang-tidy/abseil-no-internal-dependencies.cpp
index d8aea7e..272d006 100644
--- a/clang-tools-extra/test/clang-tidy/abseil-no-internal-dependencies.cpp
+++ b/clang-tools-extra/test/clang-tidy/abseil-no-internal-dependencies.cpp
@@ -2,6 +2,7 @@
 // RUN: clang-tidy -checks='-*, abseil-no-internal-dependencies' -header-filter='.*' %s -- -I %S/Inputs 2>&1 | FileCheck %s
 
 #include "absl/strings/internal-file.h"
+#include "absl/flags/internal-file.h"
 // CHECK-NOT: warning:
 
 #include "absl/external-file.h"
-- 
2.7.4