diff options
Diffstat (limited to 'clang-tools-extra')
4 files changed, 7 insertions, 16 deletions
diff --git a/clang-tools-extra/clang-tidy/abseil/AbseilMatcher.h b/clang-tools-extra/clang-tidy/abseil/AbseilMatcher.h index 0426790a289..e56720499e3 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 00000000000..c81cf9eee62 --- /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 ac52109c836..6014278e260 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 d8aea7ee320..272d0060bdb 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" |