https://github.com/vbvictor created https://github.com/llvm/llvm-project/pull/221427
None >From bf384011ee53a4432e4be7a8d69cbf66a29b90ed Mon Sep 17 00:00:00 2001 From: Victor Baranov <[email protected]> Date: Sat, 5 Sep 2026 12:49:43 +0300 Subject: [PATCH] [clang-tools-extra][NFC] Fix -Wunused-template violations --- .../clangd/unittests/CallHierarchyTests.cpp | 1 - .../clangd/unittests/ClangdLSPServerTests.cpp | 9 --------- .../clangd/unittests/ParsedASTTests.cpp | 2 -- .../clangd/unittests/PreambleTests.cpp | 4 ---- .../clangd/unittests/SymbolCollectorTests.cpp | 1 - .../clangd/unittests/TUSchedulerTests.cpp | 13 ------------- clang-tools-extra/clangd/unittests/XRefsTests.cpp | 3 --- .../unittests/clang-tidy/ClangTidyOptionsTest.cpp | 4 ---- 8 files changed, 37 deletions(-) diff --git a/clang-tools-extra/clangd/unittests/CallHierarchyTests.cpp b/clang-tools-extra/clangd/unittests/CallHierarchyTests.cpp index 463a94859cb0d..dadec026a5030 100644 --- a/clang-tools-extra/clangd/unittests/CallHierarchyTests.cpp +++ b/clang-tools-extra/clangd/unittests/CallHierarchyTests.cpp @@ -46,7 +46,6 @@ using ::testing::UnorderedElementsAre; MATCHER_P(withName, N, "") { return arg.name == N; } MATCHER_P(withDetail, N, "") { return arg.detail == N; } MATCHER_P(withFile, N, "") { return arg.uri.file() == N; } -MATCHER_P(withSelectionRange, R, "") { return arg.selectionRange == R; } template <typename... Tags> ::testing::Matcher<CallHierarchyItem> withSymbolTags(Tags... tags) { diff --git a/clang-tools-extra/clangd/unittests/ClangdLSPServerTests.cpp b/clang-tools-extra/clangd/unittests/ClangdLSPServerTests.cpp index 5d6a69c953e17..aaa3a68b856d4 100644 --- a/clang-tools-extra/clangd/unittests/ClangdLSPServerTests.cpp +++ b/clang-tools-extra/clangd/unittests/ClangdLSPServerTests.cpp @@ -366,15 +366,6 @@ TEST_F(LSPTest, ModulesTest) { ElementsAre(llvm::json::Value(2), llvm::json::Value(10))); } -// Creates a Callback that writes its received value into an -// std::optional<Expected>. -template <typename T> -llvm::unique_function<void(llvm::Expected<T>)> -capture(std::optional<llvm::Expected<T>> &Out) { - Out.reset(); - return [&Out](llvm::Expected<T> V) { Out.emplace(std::move(V)); }; -} - TEST_F(LSPTest, FeatureModulesThreadingTest) { // A feature module that does its work on a background thread, and so // exercises the block/shutdown protocol. diff --git a/clang-tools-extra/clangd/unittests/ParsedASTTests.cpp b/clang-tools-extra/clangd/unittests/ParsedASTTests.cpp index f9752d5d44f97..d7d784043a6a0 100644 --- a/clang-tools-extra/clangd/unittests/ParsedASTTests.cpp +++ b/clang-tools-extra/clangd/unittests/ParsedASTTests.cpp @@ -348,8 +348,6 @@ TEST(ParsedASTTest, CollectsMainFileMacroExpansions) { testing::UnorderedElementsAreArray(TestCase.points())); } -MATCHER_P(withFileName, Inc, "") { return arg.FileName == Inc; } - TEST(ParsedASTTest, PatchesAdditionalIncludes) { llvm::StringLiteral ModifiedContents = R"cpp( #include "baz.h" diff --git a/clang-tools-extra/clangd/unittests/PreambleTests.cpp b/clang-tools-extra/clangd/unittests/PreambleTests.cpp index a8d11bf681891..9399680398f62 100644 --- a/clang-tools-extra/clangd/unittests/PreambleTests.cpp +++ b/clang-tools-extra/clangd/unittests/PreambleTests.cpp @@ -54,10 +54,6 @@ namespace clang { namespace clangd { namespace { -MATCHER_P2(Distance, File, D, "") { - return arg.first() == File && arg.second == D; -} - // Builds a preamble for BaselineContents, patches it for ModifiedContents and // returns the includes in the patch. IncludeStructure diff --git a/clang-tools-extra/clangd/unittests/SymbolCollectorTests.cpp b/clang-tools-extra/clangd/unittests/SymbolCollectorTests.cpp index f0884e2a545a1..a04756518ef23 100644 --- a/clang-tools-extra/clangd/unittests/SymbolCollectorTests.cpp +++ b/clang-tools-extra/clangd/unittests/SymbolCollectorTests.cpp @@ -59,7 +59,6 @@ MATCHER_P(snippet, S, "") { return (arg.Name + arg.CompletionSnippetSuffix).str() == S; } MATCHER_P(qName, Name, "") { return (arg.Scope + arg.Name).str() == Name; } -MATCHER_P(hasName, Name, "") { return arg.Name == Name; } MATCHER_P(templateArgs, TemplArgs, "") { return arg.TemplateSpecializationArgs == TemplArgs; } diff --git a/clang-tools-extra/clangd/unittests/TUSchedulerTests.cpp b/clang-tools-extra/clangd/unittests/TUSchedulerTests.cpp index c6862b5eba6fa..1404f559aa2b8 100644 --- a/clang-tools-extra/clangd/unittests/TUSchedulerTests.cpp +++ b/clang-tools-extra/clangd/unittests/TUSchedulerTests.cpp @@ -63,19 +63,6 @@ using ::testing::Pointee; using ::testing::SizeIs; using ::testing::UnorderedElementsAre; -MATCHER_P2(TUState, PreambleActivity, ASTActivity, "") { - if (arg.PreambleActivity != PreambleActivity) { - *result_listener << "preamblestate is " - << static_cast<uint8_t>(arg.PreambleActivity); - return false; - } - if (arg.ASTActivity.K != ASTActivity) { - *result_listener << "aststate is " << arg.ASTActivity.K; - return false; - } - return true; -} - // Simple ContextProvider to verify the provider is invoked & contexts are used. static Key<std::string> BoundPath; Context bindPath(PathRef F) { diff --git a/clang-tools-extra/clangd/unittests/XRefsTests.cpp b/clang-tools-extra/clangd/unittests/XRefsTests.cpp index dce033af73c1a..d5ba2bc093c9c 100644 --- a/clang-tools-extra/clangd/unittests/XRefsTests.cpp +++ b/clang-tools-extra/clangd/unittests/XRefsTests.cpp @@ -46,9 +46,6 @@ std::string guard(llvm::StringRef Code) { return "#pragma once\n" + Code.str(); } -MATCHER_P2(FileRange, File, Range, "") { - return Location{URIForFile::canonicalize(File, testRoot()), Range} == arg; -} MATCHER(declRange, "") { const LocatedSymbol &Sym = ::testing::get<0>(arg); const Range &Range = ::testing::get<1>(arg); diff --git a/clang-tools-extra/unittests/clang-tidy/ClangTidyOptionsTest.cpp b/clang-tools-extra/unittests/clang-tidy/ClangTidyOptionsTest.cpp index d5725609f367f..4e0b77091f992 100644 --- a/clang-tools-extra/unittests/clang-tidy/ClangTidyOptionsTest.cpp +++ b/clang-tools-extra/unittests/clang-tidy/ClangTidyOptionsTest.cpp @@ -315,10 +315,6 @@ class TestCheck : public ClangTidyCheck { return Options.get(std::forward<Args>(Arguments)...); } - template <typename... Args> auto getGlobal(Args &&... Arguments) { - return Options.getLocalOrGlobal(std::forward<Args>(Arguments)...); - } - template <typename IntType = int, typename... Args> auto getIntLocal(Args &&... Arguments) { return Options.get<IntType>(std::forward<Args>(Arguments)...); _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
