Merge pull request #4754 from apple/eng/5.7-fix-clangd-tests

Fix the clangd test build

Author: hyp

clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp

@@ -3328,14 +3328,14 @@ TEST(CompletionTest, Concepts) {
   std::vector<Symbol> Syms = {conceptSym("same_as")};
   for (auto P : Code.points("tparam")) {
     ASSERT_THAT(completions(TU, P, Syms).Completions,
-                AllOf(Contains(named("A")), Contains(named("same_as")),
-                      Contains(named("class")), Contains(named("typename"))))
+                AllOf(Contains(Named("A")), Contains(Named("same_as")),
+                      Contains(Named("class")), Contains(Named("typename"))))
         << "Completing template parameter at position " << P;
   }
 
   for (auto P : Code.points("other")) {
     EXPECT_THAT(completions(TU, P, Syms).Completions,
-                AllOf(Contains(named("A")), Contains(named("same_as"))))
+                AllOf(Contains(Named("A")), Contains(Named("same_as"))))
         << "Completing 'requires' expression at position " << P;
   }
 }

clang-tools-extra/clangd/unittests/SymbolCollectorTests.cpp

@@ -1858,7 +1858,7 @@ TEST_F(SymbolCollectorTest, Concepts) {
   runSymbolCollector("", Header, {"-std=c++20"});
   EXPECT_THAT(Symbols,
               UnorderedElementsAre(AllOf(
-                  qName("A"), hasKind(clang::index::SymbolKind::Concept))));
+                  QName("A"), hasKind(clang::index::SymbolKind::Concept))));
 }
 
 } // namespace