commit 61645e1bb4380dc3e30b27370e93ca84591ee831
author Dmitri Gribenko <dmitrig@google.com> Mon Jul 17 04:46:21 2023 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Jul 17 04:46:53 2023 -0700
tree 0757483a81724dcf7da520fc9c0d32cef3dd3ddf
parent 37e19428e8a2d82bcb7f9de948f9ce00c715c0ac

Fix ClangTidy issues

PiperOrigin-RevId: 548651750
Change-Id: I6971f91ac8f4b605d17ca345c8ddf1ba4c0578e8

nullability/BUILD

diff --git a/nullability/BUILD b/nullability/BUILD
index 55e37e0..2d4e9c4 100644
--- a/nullability/BUILD
+++ b/nullability/BUILD
@@ -109,9 +109,7 @@
     deps = [
         ":pointer_nullability",
         "@llvm-project//clang:analysis",
-        "@llvm-project//clang:testing",
-        "@llvm-project//llvm:Support",
-        "@llvm-project//third-party/unittest:gmock",
+        "@llvm-project//clang:ast",
         "@llvm-project//third-party/unittest:gtest",
         "@llvm-project//third-party/unittest:gtest_main",
     ],

nullability/inference/BUILD

diff --git a/nullability/inference/BUILD b/nullability/inference/BUILD
index d65fc9b..5fbcc37 100644
--- a/nullability/inference/BUILD
+++ b/nullability/inference/BUILD
@@ -29,7 +29,6 @@
     deps = [
         ":collect_evidence",
         ":inference_cc_proto",
-        "@absl//absl/log:check",
         "@llvm-project//clang:ast",
         "@llvm-project//clang:basic",
         "@llvm-project//clang:testing",

nullability/inference/collect_evidence_test.cc

diff --git a/nullability/inference/collect_evidence_test.cc b/nullability/inference/collect_evidence_test.cc
index 49d1580..84e7b58 100644
--- a/nullability/inference/collect_evidence_test.cc
+++ b/nullability/inference/collect_evidence_test.cc
@@ -4,6 +4,7 @@
 
 #include "nullability/inference/collect_evidence.h"
 
+#include <string>
 #include <utility>
 #include <vector>
 
@@ -22,7 +23,6 @@
 namespace clang::tidy::nullability {
 namespace {
 using ::testing::ElementsAre;
-using ::testing::HasSubstr;
 using ::testing::IsEmpty;
 using ::testing::UnorderedElementsAre;
 

nullability/pointer_nullability_matchers.cc

diff --git a/nullability/pointer_nullability_matchers.cc b/nullability/pointer_nullability_matchers.cc
index 0b5ef0c..dda8929 100644
--- a/nullability/pointer_nullability_matchers.cc
+++ b/nullability/pointer_nullability_matchers.cc
@@ -4,7 +4,9 @@
 
 #include "nullability/pointer_nullability_matchers.h"
 
+#include "clang/AST/DeclCXX.h"
 #include "clang/AST/OperationKinds.h"
+#include "clang/AST/Stmt.h"
 #include "clang/ASTMatchers/ASTMatchers.h"
 
 namespace clang::tidy::nullability {
@@ -15,7 +17,6 @@
 using ast_matchers::cxxConstructExpr;
 using ast_matchers::cxxCtorInitializer;
 using ast_matchers::cxxThisExpr;
-using ast_matchers::declRefExpr;
 using ast_matchers::expr;
 using ast_matchers::hasAnyOperatorName;
 using ast_matchers::hasCastKind;

nullability/pointer_nullability_test.cc

diff --git a/nullability/pointer_nullability_test.cc b/nullability/pointer_nullability_test.cc
index 87e0dcc..eae754c 100644
--- a/nullability/pointer_nullability_test.cc
+++ b/nullability/pointer_nullability_test.cc
@@ -4,15 +4,17 @@
 
 #include "nullability/pointer_nullability.h"
 
+#include <memory>
+
+#include "clang/AST/Type.h"
+#include "clang/Analysis/FlowSensitive/DataflowAnalysisContext.h"
+#include "clang/Analysis/FlowSensitive/Formula.h"
+#include "clang/Analysis/FlowSensitive/Value.h"
 #include "clang/Analysis/FlowSensitive/WatchedLiteralsSolver.h"
-#include "clang/Testing/TestAST.h"
-#include "llvm/ADT/StringRef.h"
-#include "third_party/llvm/llvm-project/third-party/unittest/googlemock/include/gmock/gmock.h"
 #include "third_party/llvm/llvm-project/third-party/unittest/googletest/include/gtest/gtest.h"
 
 namespace clang::tidy::nullability {
 namespace {
-using testing::ElementsAre;
 
 TEST(NullabilityPropertiesTest, Test) {
   dataflow::DataflowAnalysisContext DACtx(