Rename /nullability_verification to /nullability in preparation for adding/relocating inference functionality here.

PiperOrigin-RevId: 528495113

nullability/BUILD

diff --git a/nullability_verification/BUILD b/nullability/BUILD
similarity index 93%
rename from nullability_verification/BUILD
rename to nullability/BUILD
index eafe897..7272c47 100644
--- a/nullability_verification/BUILD
+++ b/nullability/BUILD
@@ -1,4 +1,4 @@
-# Verification for null safety
+# Verification and Inference for null safety
 
 package(default_applicable_licenses = ["//:license"])
 
@@ -26,7 +26,7 @@
     name = "pointer_nullability_analysis",
     srcs = ["pointer_nullability_analysis.cc"],
     hdrs = ["pointer_nullability_analysis.h"],
-    visibility = ["//nullability_verification/test:__pkg__"],
+    visibility = ["//nullability/test:__pkg__"],
     deps = [
         ":pointer_nullability",
         ":pointer_nullability_lattice",
@@ -44,7 +44,7 @@
     name = "pointer_nullability_diagnosis",
     srcs = ["pointer_nullability_diagnosis.cc"],
     hdrs = ["pointer_nullability_diagnosis.h"],
-    visibility = ["//nullability_verification/test:__pkg__"],
+    visibility = ["//nullability/test:__pkg__"],
     deps = [
         ":pointer_nullability",
         ":pointer_nullability_lattice",

nullability/formal_methods/gradual_nullability_code_synthesis.smt2

diff --git a/nullability_verification/formal_methods/gradual_nullability_code_synthesis.smt2 b/nullability/formal_methods/gradual_nullability_code_synthesis.smt2
similarity index 100%
rename from nullability_verification/formal_methods/gradual_nullability_code_synthesis.smt2
rename to nullability/formal_methods/gradual_nullability_code_synthesis.smt2

nullability/formal_methods/optional.smt2

diff --git a/nullability_verification/formal_methods/optional.smt2 b/nullability/formal_methods/optional.smt2
similarity index 100%
rename from nullability_verification/formal_methods/optional.smt2
rename to nullability/formal_methods/optional.smt2

nullability/formal_methods/optional_code_synthesis.smt2

diff --git a/nullability_verification/formal_methods/optional_code_synthesis.smt2 b/nullability/formal_methods/optional_code_synthesis.smt2
similarity index 100%
rename from nullability_verification/formal_methods/optional_code_synthesis.smt2
rename to nullability/formal_methods/optional_code_synthesis.smt2

nullability/pointer_nullability.cc

diff --git a/nullability_verification/pointer_nullability.cc b/nullability/pointer_nullability.cc
similarity index 98%
rename from nullability_verification/pointer_nullability.cc
rename to nullability/pointer_nullability.cc
index 28b0e67..34e16ff 100644
--- a/nullability_verification/pointer_nullability.cc
+++ b/nullability/pointer_nullability.cc
@@ -2,10 +2,10 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "nullability_verification/pointer_nullability.h"
+#include "nullability/pointer_nullability.h"
 
 #include "absl/log/check.h"
-#include "nullability_verification/pointer_nullability_lattice.h"
+#include "nullability/pointer_nullability_lattice.h"
 #include "clang/AST/ASTDumper.h"
 #include "clang/AST/TypeVisitor.h"
 #include "clang/Analysis/FlowSensitive/CFGMatchSwitch.h"

nullability/pointer_nullability.h

diff --git a/nullability_verification/pointer_nullability.h b/nullability/pointer_nullability.h
similarity index 95%
rename from nullability_verification/pointer_nullability.h
rename to nullability/pointer_nullability.h
index b2f4ae3..b88a889 100644
--- a/nullability_verification/pointer_nullability.h
+++ b/nullability/pointer_nullability.h
@@ -2,12 +2,12 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef CRUBIT_NULLABILITY_VERIFICATION_POINTER_NULLABILITY_H_
-#define CRUBIT_NULLABILITY_VERIFICATION_POINTER_NULLABILITY_H_
+#ifndef CRUBIT_NULLABILITY_POINTER_NULLABILITY_H_
+#define CRUBIT_NULLABILITY_POINTER_NULLABILITY_H_
 
 #include <utility>
 
-#include "nullability_verification/pointer_nullability_lattice.h"
+#include "nullability/pointer_nullability_lattice.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/ASTDumper.h"
 #include "clang/AST/Expr.h"
@@ -148,4 +148,4 @@
 }  // namespace tidy
 }  // namespace clang
 
-#endif  // CRUBIT_NULLABILITY_VERIFICATION_POINTER_NULLABILITY_H_
+#endif  // CRUBIT_NULLABILITY_POINTER_NULLABILITY_H_

nullability/pointer_nullability_analysis.cc

diff --git a/nullability_verification/pointer_nullability_analysis.cc b/nullability/pointer_nullability_analysis.cc
similarity index 98%
rename from nullability_verification/pointer_nullability_analysis.cc
rename to nullability/pointer_nullability_analysis.cc
index 9479b84..7ab5c82 100644
--- a/nullability_verification/pointer_nullability_analysis.cc
+++ b/nullability/pointer_nullability_analysis.cc
@@ -2,16 +2,16 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "nullability_verification/pointer_nullability_analysis.h"
+#include "nullability/pointer_nullability_analysis.h"
 
 #include <optional>
 #include <string>
 #include <vector>
 
 #include "absl/log/check.h"
-#include "nullability_verification/pointer_nullability.h"
-#include "nullability_verification/pointer_nullability_lattice.h"
-#include "nullability_verification/pointer_nullability_matchers.h"
+#include "nullability/pointer_nullability.h"
+#include "nullability/pointer_nullability_lattice.h"
+#include "nullability/pointer_nullability_matchers.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/ASTDumper.h"
 #include "clang/AST/Expr.h"

nullability/pointer_nullability_analysis.h

diff --git a/nullability_verification/pointer_nullability_analysis.h b/nullability/pointer_nullability_analysis.h
similarity index 86%
rename from nullability_verification/pointer_nullability_analysis.h
rename to nullability/pointer_nullability_analysis.h
index c1d90cc..0b88497 100644
--- a/nullability_verification/pointer_nullability_analysis.h
+++ b/nullability/pointer_nullability_analysis.h
@@ -2,10 +2,10 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef CRUBIT_NULLABILITY_VERIFICATION_POINTER_NULLABILITY_ANALYSIS_H_
-#define CRUBIT_NULLABILITY_VERIFICATION_POINTER_NULLABILITY_ANALYSIS_H_
+#ifndef CRUBIT_NULLABILITY_POINTER_NULLABILITY_ANALYSIS_H_
+#define CRUBIT_NULLABILITY_POINTER_NULLABILITY_ANALYSIS_H_
 
-#include "nullability_verification/pointer_nullability_lattice.h"
+#include "nullability/pointer_nullability_lattice.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/Type.h"
 #include "clang/Analysis/FlowSensitive/CFGMatchSwitch.h"
@@ -54,4 +54,4 @@
 }  // namespace tidy
 }  // namespace clang
 
-#endif  // CRUBIT_NULLABILITY_VERIFICATION_POINTER_NULLABILITY_ANALYSIS_H_
+#endif  // CRUBIT_NULLABILITY_POINTER_NULLABILITY_ANALYSIS_H_

nullability/pointer_nullability_diagnosis.cc

diff --git a/nullability_verification/pointer_nullability_diagnosis.cc b/nullability/pointer_nullability_diagnosis.cc
similarity index 98%
rename from nullability_verification/pointer_nullability_diagnosis.cc
rename to nullability/pointer_nullability_diagnosis.cc
index 9a4de33..8289142 100644
--- a/nullability_verification/pointer_nullability_diagnosis.cc
+++ b/nullability/pointer_nullability_diagnosis.cc
@@ -2,13 +2,13 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "nullability_verification/pointer_nullability_diagnosis.h"
+#include "nullability/pointer_nullability_diagnosis.h"
 
 #include <optional>
 #include <string>
 
-#include "nullability_verification/pointer_nullability.h"
-#include "nullability_verification/pointer_nullability_matchers.h"
+#include "nullability/pointer_nullability.h"
+#include "nullability/pointer_nullability_matchers.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/DeclCXX.h"
 #include "clang/AST/Expr.h"

nullability/pointer_nullability_diagnosis.h

diff --git a/nullability_verification/pointer_nullability_diagnosis.h b/nullability/pointer_nullability_diagnosis.h
similarity index 83%
rename from nullability_verification/pointer_nullability_diagnosis.h
rename to nullability/pointer_nullability_diagnosis.h
index 5551f2d..57cf6a1 100644
--- a/nullability_verification/pointer_nullability_diagnosis.h
+++ b/nullability/pointer_nullability_diagnosis.h
@@ -2,12 +2,12 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef CRUBIT_NULLABILITY_VERIFICATION_POINTER_NULLABILITY_DIAGNOSIS_H_
-#define CRUBIT_NULLABILITY_VERIFICATION_POINTER_NULLABILITY_DIAGNOSIS_H_
+#ifndef CRUBIT_NULLABILITY_POINTER_NULLABILITY_DIAGNOSIS_H_
+#define CRUBIT_NULLABILITY_POINTER_NULLABILITY_DIAGNOSIS_H_
 
 #include <optional>
 
-#include "nullability_verification/pointer_nullability_lattice.h"
+#include "nullability/pointer_nullability_lattice.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/Stmt.h"
 #include "clang/Analysis/FlowSensitive/CFGMatchSwitch.h"
@@ -50,4 +50,4 @@
 }  // namespace tidy
 }  // namespace clang
 
-#endif  // CRUBIT_NULLABILITY_VERIFICATION_POINTER_NULLABILITY_DIAGNOSIS_H_
+#endif  // CRUBIT_NULLABILITY_POINTER_NULLABILITY_DIAGNOSIS_H_

nullability/pointer_nullability_lattice.h

diff --git a/nullability_verification/pointer_nullability_lattice.h b/nullability/pointer_nullability_lattice.h
similarity index 90%
rename from nullability_verification/pointer_nullability_lattice.h
rename to nullability/pointer_nullability_lattice.h
index 538bdaa..66222c5 100644
--- a/nullability_verification/pointer_nullability_lattice.h
+++ b/nullability/pointer_nullability_lattice.h
@@ -2,8 +2,8 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef THIRD_PARTY_CRUBIT_NULLABILITY_VERIFICATION_POINTER_NULLABILITY_LATTICE_H_
-#define THIRD_PARTY_CRUBIT_NULLABILITY_VERIFICATION_POINTER_NULLABILITY_LATTICE_H_
+#ifndef THIRD_PARTY_CRUBIT_NULLABILITY_POINTER_NULLABILITY_LATTICE_H_
+#define THIRD_PARTY_CRUBIT_NULLABILITY_POINTER_NULLABILITY_LATTICE_H_
 
 #include <optional>
 #include <ostream>
@@ -72,4 +72,4 @@
 }  // namespace tidy
 }  // namespace clang
 
-#endif  // THIRD_PARTY_CRUBIT_NULLABILITY_VERIFICATION_POINTER_NULLABILITY_LATTICE_H_
+#endif  // THIRD_PARTY_CRUBIT_NULLABILITY_POINTER_NULLABILITY_LATTICE_H_

nullability/pointer_nullability_matchers.cc

diff --git a/nullability_verification/pointer_nullability_matchers.cc b/nullability/pointer_nullability_matchers.cc
similarity index 96%
rename from nullability_verification/pointer_nullability_matchers.cc
rename to nullability/pointer_nullability_matchers.cc
index cb9b8a0..e2416c5 100644
--- a/nullability_verification/pointer_nullability_matchers.cc
+++ b/nullability/pointer_nullability_matchers.cc
@@ -2,7 +2,7 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "nullability_verification/pointer_nullability_matchers.h"
+#include "nullability/pointer_nullability_matchers.h"
 
 #include "clang/AST/OperationKinds.h"
 #include "clang/ASTMatchers/ASTMatchers.h"

nullability/pointer_nullability_matchers.h

diff --git a/nullability_verification/pointer_nullability_matchers.h b/nullability/pointer_nullability_matchers.h
similarity index 83%
rename from nullability_verification/pointer_nullability_matchers.h
rename to nullability/pointer_nullability_matchers.h
index 7e26730..353bbe8 100644
--- a/nullability_verification/pointer_nullability_matchers.h
+++ b/nullability/pointer_nullability_matchers.h
@@ -2,8 +2,8 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef CRUBIT_NULLABILITY_VERIFICATION_POINTER_NULLABILITY_MATCHERS_H_
-#define CRUBIT_NULLABILITY_VERIFICATION_POINTER_NULLABILITY_MATCHERS_H_
+#ifndef CRUBIT_NULLABILITY_POINTER_NULLABILITY_MATCHERS_H_
+#define CRUBIT_NULLABILITY_POINTER_NULLABILITY_MATCHERS_H_
 
 #include "clang/ASTMatchers/ASTMatchersInternal.h"
 
@@ -29,4 +29,4 @@
 }  // namespace tidy
 }  // namespace clang
 
-#endif  // CRUBIT_NULLABILITY_VERIFICATION_POINTER_NULLABILITY_MATCHERS_H_
+#endif  // CRUBIT_NULLABILITY_POINTER_NULLABILITY_MATCHERS_H_

nullability/pointer_nullability_test.cc

diff --git a/nullability_verification/pointer_nullability_test.cc b/nullability/pointer_nullability_test.cc
similarity index 99%
rename from nullability_verification/pointer_nullability_test.cc
rename to nullability/pointer_nullability_test.cc
index 5f59121..89a6bbc 100644
--- a/nullability_verification/pointer_nullability_test.cc
+++ b/nullability/pointer_nullability_test.cc
@@ -2,7 +2,7 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "nullability_verification/pointer_nullability.h"
+#include "nullability/pointer_nullability.h"
 
 #include "clang/Testing/TestAST.h"
 #include "llvm/ADT/StringRef.h"

nullability/test/BUILD

diff --git a/nullability_verification/test/BUILD b/nullability/test/BUILD
similarity index 97%
rename from nullability_verification/test/BUILD
rename to nullability/test/BUILD
index 87e1baf..cf99fe9 100644
--- a/nullability_verification/test/BUILD
+++ b/nullability/test/BUILD
@@ -8,8 +8,8 @@
     srcs = ["check_diagnostics.cc"],
     hdrs = ["check_diagnostics.h"],
     deps = [
-        "//nullability_verification:pointer_nullability_analysis",
-        "//nullability_verification:pointer_nullability_diagnosis",
+        "//nullability:pointer_nullability_analysis",
+        "//nullability:pointer_nullability_diagnosis",
         "@llvm-project//clang:analysis",
         "@llvm-project//clang/unittests:dataflow_testing_support",
         "@llvm-project//llvm:Support",

nullability/test/aliases.cc

diff --git a/nullability_verification/test/aliases.cc b/nullability/test/aliases.cc
similarity index 92%
rename from nullability_verification/test/aliases.cc
rename to nullability/test/aliases.cc
index 0f52df8..852a482 100644
--- a/nullability_verification/test/aliases.cc
+++ b/nullability/test/aliases.cc
@@ -4,7 +4,7 @@
 
 // Tests for nullability information hidden behind aliases.
 
-#include "nullability_verification/test/check_diagnostics.h"
+#include "nullability/test/check_diagnostics.h"
 #include "third_party/llvm/llvm-project/third-party/unittest/googletest/include/gtest/gtest.h"
 
 namespace clang::tidy::nullability {

nullability/test/assert_nullability_test.cc

diff --git a/nullability_verification/test/assert_nullability_test.cc b/nullability/test/assert_nullability_test.cc
similarity index 98%
rename from nullability_verification/test/assert_nullability_test.cc
rename to nullability/test/assert_nullability_test.cc
index 9f3f374..2bdc10f 100644
--- a/nullability_verification/test/assert_nullability_test.cc
+++ b/nullability/test/assert_nullability_test.cc
@@ -13,7 +13,7 @@
 // For the time being, the `_test` suffix at the end of the filename is
 // intended as a weak way of indicating this.
 
-#include "nullability_verification/test/check_diagnostics.h"
+#include "nullability/test/check_diagnostics.h"
 #include "third_party/llvm/llvm-project/third-party/unittest/googletest/include/gtest/gtest.h"
 
 namespace clang {

nullability/test/basic.cc

diff --git a/nullability_verification/test/basic.cc b/nullability/test/basic.cc
similarity index 98%
rename from nullability_verification/test/basic.cc
rename to nullability/test/basic.cc
index 1194501..9e8804e 100644
--- a/nullability_verification/test/basic.cc
+++ b/nullability/test/basic.cc
@@ -4,7 +4,7 @@
 
 // Tests for basic functionality (simple dereferences without control flow).
 
-#include "nullability_verification/test/check_diagnostics.h"
+#include "nullability/test/check_diagnostics.h"
 #include "third_party/llvm/llvm-project/third-party/unittest/googletest/include/gtest/gtest.h"
 
 namespace clang {

nullability/test/binary_ops.cc

diff --git a/nullability_verification/test/binary_ops.cc b/nullability/test/binary_ops.cc
similarity index 96%
rename from nullability_verification/test/binary_ops.cc
rename to nullability/test/binary_ops.cc
index c956fc2..ecb1443 100644
--- a/nullability_verification/test/binary_ops.cc
+++ b/nullability/test/binary_ops.cc
@@ -4,7 +4,7 @@
 
 // Tests for binary operators.
 
-#include "nullability_verification/test/check_diagnostics.h"
+#include "nullability/test/check_diagnostics.h"
 #include "third_party/llvm/llvm-project/third-party/unittest/googletest/include/gtest/gtest.h"
 
 namespace clang {

nullability/test/casts.cc

diff --git a/nullability_verification/test/casts.cc b/nullability/test/casts.cc
similarity index 98%
rename from nullability_verification/test/casts.cc
rename to nullability/test/casts.cc
index 4358fee..e719d3c 100644
--- a/nullability_verification/test/casts.cc
+++ b/nullability/test/casts.cc
@@ -4,7 +4,7 @@
 
 // Tests for casts of types containing nullability annotations.
 
-#include "nullability_verification/test/check_diagnostics.h"
+#include "nullability/test/check_diagnostics.h"
 #include "third_party/llvm/llvm-project/third-party/unittest/googletest/include/gtest/gtest.h"
 
 namespace clang {

nullability/test/check_diagnostics.cc

diff --git a/nullability_verification/test/check_diagnostics.cc b/nullability/test/check_diagnostics.cc
similarity index 94%
rename from nullability_verification/test/check_diagnostics.cc
rename to nullability/test/check_diagnostics.cc
index 2009f2f..a66d444 100644
--- a/nullability_verification/test/check_diagnostics.cc
+++ b/nullability/test/check_diagnostics.cc
@@ -2,10 +2,10 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "nullability_verification/test/check_diagnostics.h"
+#include "nullability/test/check_diagnostics.h"
 
-#include "nullability_verification/pointer_nullability_analysis.h"
-#include "nullability_verification/pointer_nullability_diagnosis.h"
+#include "nullability/pointer_nullability_analysis.h"
+#include "nullability/pointer_nullability_diagnosis.h"
 #include "clang/Analysis/CFG.h"
 #include "third_party/llvm/llvm-project/clang/unittests/Analysis/FlowSensitive/TestingSupport.h"
 #include "llvm/Testing/Support/Error.h"

nullability/test/check_diagnostics.h

diff --git a/nullability_verification/test/check_diagnostics.h b/nullability/test/check_diagnostics.h
similarity index 75%
rename from nullability_verification/test/check_diagnostics.h
rename to nullability/test/check_diagnostics.h
index facb9ea..9d05b76 100644
--- a/nullability_verification/test/check_diagnostics.h
+++ b/nullability/test/check_diagnostics.h
@@ -2,8 +2,8 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef THIRD_PARTY_CRUBIT_NULLABILITY_VERIFICATION_TEST_CHECK_DIAGNOSTICS_H_
-#define THIRD_PARTY_CRUBIT_NULLABILITY_VERIFICATION_TEST_CHECK_DIAGNOSTICS_H_
+#ifndef THIRD_PARTY_CRUBIT_NULLABILITY_TEST_CHECK_DIAGNOSTICS_H_
+#define THIRD_PARTY_CRUBIT_NULLABILITY_TEST_CHECK_DIAGNOSTICS_H_
 
 #include "llvm/ADT/StringRef.h"
 
@@ -22,4 +22,4 @@
 }  // namespace tidy
 }  // namespace clang
 
-#endif  // THIRD_PARTY_CRUBIT_NULLABILITY_VERIFICATION_TEST_CHECK_DIAGNOSTICS_H_
+#endif  // THIRD_PARTY_CRUBIT_NULLABILITY_TEST_CHECK_DIAGNOSTICS_H_

nullability/test/comparisons.cc

diff --git a/nullability_verification/test/comparisons.cc b/nullability/test/comparisons.cc
similarity index 99%
rename from nullability_verification/test/comparisons.cc
rename to nullability/test/comparisons.cc
index 724fe02..62d1163 100644
--- a/nullability_verification/test/comparisons.cc
+++ b/nullability/test/comparisons.cc
@@ -4,7 +4,7 @@
 
 // Tests for comparisons of types containing nullability annotations.
 
-#include "nullability_verification/test/check_diagnostics.h"
+#include "nullability/test/check_diagnostics.h"
 #include "third_party/llvm/llvm-project/third-party/unittest/googletest/include/gtest/gtest.h"
 
 namespace clang {

nullability/test/constructors.cc

diff --git a/nullability_verification/test/constructors.cc b/nullability/test/constructors.cc
similarity index 97%
rename from nullability_verification/test/constructors.cc
rename to nullability/test/constructors.cc
index 63d564a..51a2cb0 100644
--- a/nullability_verification/test/constructors.cc
+++ b/nullability/test/constructors.cc
@@ -4,7 +4,7 @@
 
 // Tests for constructors.
 
-#include "nullability_verification/test/check_diagnostics.h"
+#include "nullability/test/check_diagnostics.h"
 #include "third_party/llvm/llvm-project/third-party/unittest/googletest/include/gtest/gtest.h"
 
 namespace clang {

nullability/test/fields.cc

diff --git a/nullability_verification/test/fields.cc b/nullability/test/fields.cc
similarity index 97%
rename from nullability_verification/test/fields.cc
rename to nullability/test/fields.cc
index ee67f9b..e1f3f15 100644
--- a/nullability_verification/test/fields.cc
+++ b/nullability/test/fields.cc
@@ -4,7 +4,7 @@
 
 // Tests for nullability annotations on fields.
 
-#include "nullability_verification/test/check_diagnostics.h"
+#include "nullability/test/check_diagnostics.h"
 #include "third_party/llvm/llvm-project/third-party/unittest/googletest/include/gtest/gtest.h"
 
 namespace clang {

nullability/test/function_calls.cc

diff --git a/nullability_verification/test/function_calls.cc b/nullability/test/function_calls.cc
similarity index 99%
rename from nullability_verification/test/function_calls.cc
rename to nullability/test/function_calls.cc
index 0b87b2c..12f1310 100644
--- a/nullability_verification/test/function_calls.cc
+++ b/nullability/test/function_calls.cc
@@ -4,7 +4,7 @@
 
 // Tests for function calls.
 
-#include "nullability_verification/test/check_diagnostics.h"
+#include "nullability/test/check_diagnostics.h"
 #include "third_party/llvm/llvm-project/third-party/unittest/googletest/include/gtest/gtest.h"
 
 namespace clang {

nullability/test/function_pointers.cc

diff --git a/nullability_verification/test/function_pointers.cc b/nullability/test/function_pointers.cc
similarity index 97%
rename from nullability_verification/test/function_pointers.cc
rename to nullability/test/function_pointers.cc
index aabfca2..290ba15 100644
--- a/nullability_verification/test/function_pointers.cc
+++ b/nullability/test/function_pointers.cc
@@ -4,7 +4,7 @@
 
 // Tests for nullability of function pointers.
 
-#include "nullability_verification/test/check_diagnostics.h"
+#include "nullability/test/check_diagnostics.h"
 #include "third_party/llvm/llvm-project/third-party/unittest/googletest/include/gtest/gtest.h"
 
 namespace clang {

nullability/test/initialization.cc

diff --git a/nullability_verification/test/initialization.cc b/nullability/test/initialization.cc
similarity index 94%
rename from nullability_verification/test/initialization.cc
rename to nullability/test/initialization.cc
index d872e0f..fd03f7e 100644
--- a/nullability_verification/test/initialization.cc
+++ b/nullability/test/initialization.cc
@@ -4,7 +4,7 @@
 
 // Tests that check nullability is transferred correctly across initializers.
 
-#include "nullability_verification/test/check_diagnostics.h"
+#include "nullability/test/check_diagnostics.h"
 #include "third_party/llvm/llvm-project/third-party/unittest/googletest/include/gtest/gtest.h"
 
 namespace clang {

nullability/test/merge.cc

diff --git a/nullability_verification/test/merge.cc b/nullability/test/merge.cc
similarity index 98%
rename from nullability_verification/test/merge.cc
rename to nullability/test/merge.cc
index 50553dd..e9e2787 100644
--- a/nullability_verification/test/merge.cc
+++ b/nullability/test/merge.cc
@@ -4,7 +4,7 @@
 
 // Tests for merging different nullability types.
 
-#include "nullability_verification/test/check_diagnostics.h"
+#include "nullability/test/check_diagnostics.h"
 #include "third_party/llvm/llvm-project/third-party/unittest/googletest/include/gtest/gtest.h"
 
 namespace clang {

nullability/test/operator_new.cc

diff --git a/nullability_verification/test/operator_new.cc b/nullability/test/operator_new.cc
similarity index 96%
rename from nullability_verification/test/operator_new.cc
rename to nullability/test/operator_new.cc
index 6e6301a..585efc3 100644
--- a/nullability_verification/test/operator_new.cc
+++ b/nullability/test/operator_new.cc
@@ -4,7 +4,7 @@
 
 // Tests for operator new.
 
-#include "nullability_verification/test/check_diagnostics.h"
+#include "nullability/test/check_diagnostics.h"
 #include "third_party/llvm/llvm-project/third-party/unittest/googletest/include/gtest/gtest.h"
 
 namespace clang {

nullability/test/parens.cc

diff --git a/nullability_verification/test/parens.cc b/nullability/test/parens.cc
similarity index 95%
rename from nullability_verification/test/parens.cc
rename to nullability/test/parens.cc
index f27fdea..926a148 100644
--- a/nullability_verification/test/parens.cc
+++ b/nullability/test/parens.cc
@@ -4,7 +4,7 @@
 
 // Tests for parenthesized expressions.
 
-#include "nullability_verification/test/check_diagnostics.h"
+#include "nullability/test/check_diagnostics.h"
 #include "third_party/llvm/llvm-project/third-party/unittest/googletest/include/gtest/gtest.h"
 
 namespace clang {

nullability/test/pointer_arithmetic.cc

diff --git a/nullability_verification/test/pointer_arithmetic.cc b/nullability/test/pointer_arithmetic.cc
similarity index 95%
rename from nullability_verification/test/pointer_arithmetic.cc
rename to nullability/test/pointer_arithmetic.cc
index 1df9f3f..8af4adf 100644
--- a/nullability_verification/test/pointer_arithmetic.cc
+++ b/nullability/test/pointer_arithmetic.cc
@@ -4,7 +4,7 @@
 
 // Tests for pointer arithmetic.
 
-#include "nullability_verification/test/check_diagnostics.h"
+#include "nullability/test/check_diagnostics.h"
 #include "third_party/llvm/llvm-project/third-party/unittest/googletest/include/gtest/gtest.h"
 
 namespace clang {

nullability/test/return_statements.cc

diff --git a/nullability_verification/test/return_statements.cc b/nullability/test/return_statements.cc
similarity index 97%
rename from nullability_verification/test/return_statements.cc
rename to nullability/test/return_statements.cc
index 53c417f..4672c1e 100644
--- a/nullability_verification/test/return_statements.cc
+++ b/nullability/test/return_statements.cc
@@ -4,7 +4,7 @@
 
 // Tests for return statements.
 
-#include "nullability_verification/test/check_diagnostics.h"
+#include "nullability/test/check_diagnostics.h"
 #include "third_party/llvm/llvm-project/third-party/unittest/googletest/include/gtest/gtest.h"
 
 namespace clang {

nullability/test/templates.cc

diff --git a/nullability_verification/test/templates.cc b/nullability/test/templates.cc
similarity index 99%
rename from nullability_verification/test/templates.cc
rename to nullability/test/templates.cc
index e0135f5..2de241a 100644
--- a/nullability_verification/test/templates.cc
+++ b/nullability/test/templates.cc
@@ -4,7 +4,7 @@
 
 // Tests for nullability annotations in template arguments.
 
-#include "nullability_verification/test/check_diagnostics.h"
+#include "nullability/test/check_diagnostics.h"
 #include "third_party/llvm/llvm-project/third-party/unittest/googletest/include/gtest/gtest.h"
 
 namespace clang {

nullability/test/temporary_materialization.cc

diff --git a/nullability_verification/test/temporary_materialization.cc b/nullability/test/temporary_materialization.cc
similarity index 97%
rename from nullability_verification/test/temporary_materialization.cc
rename to nullability/test/temporary_materialization.cc
index 212948b..4851c88 100644
--- a/nullability_verification/test/temporary_materialization.cc
+++ b/nullability/test/temporary_materialization.cc
@@ -4,7 +4,7 @@
 
 // Tests for temporary materialization.
 
-#include "nullability_verification/test/check_diagnostics.h"
+#include "nullability/test/check_diagnostics.h"
 #include "third_party/llvm/llvm-project/third-party/unittest/googletest/include/gtest/gtest.h"
 
 namespace clang {

nullability/test/this_pointer.cc

diff --git a/nullability_verification/test/this_pointer.cc b/nullability/test/this_pointer.cc
similarity index 93%
rename from nullability_verification/test/this_pointer.cc
rename to nullability/test/this_pointer.cc
index 9d67d36..cc4ed74 100644
--- a/nullability_verification/test/this_pointer.cc
+++ b/nullability/test/this_pointer.cc
@@ -7,7 +7,7 @@
 #include <set>
 #include <string>
 
-#include "nullability_verification/test/check_diagnostics.h"
+#include "nullability/test/check_diagnostics.h"
 #include "third_party/llvm/llvm-project/third-party/unittest/googletest/include/gtest/gtest.h"
 
 namespace clang {

nullability/test/variance.cc

diff --git a/nullability_verification/test/variance.cc b/nullability/test/variance.cc
similarity index 94%
rename from nullability_verification/test/variance.cc
rename to nullability/test/variance.cc
index 7bdf243..2bb41da 100644
--- a/nullability_verification/test/variance.cc
+++ b/nullability/test/variance.cc
@@ -4,7 +4,7 @@
 
 // Tests for correct treatment of type variance.
 
-#include "nullability_verification/test/check_diagnostics.h"
+#include "nullability/test/check_diagnostics.h"
 #include "third_party/llvm/llvm-project/third-party/unittest/googletest/include/gtest/gtest.h"
 
 namespace clang {

nullability/type_nullability.cc

diff --git a/nullability_verification/type_nullability.cc b/nullability/type_nullability.cc
similarity index 98%
rename from nullability_verification/type_nullability.cc
rename to nullability/type_nullability.cc
index 3d4abf3..307239d 100644
--- a/nullability_verification/type_nullability.cc
+++ b/nullability/type_nullability.cc
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #include "absl/log/check.h"
-#include "nullability_verification/pointer_nullability.h"
+#include "nullability/pointer_nullability.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/DeclTemplate.h"
 #include "clang/AST/Type.h"