Rename ptr.h to nonnull.h (#839)

carbon-language · Sep 20, 2021 · 4503152 · 4503152
1 parent ac050c5
commit 4503152
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 14 deletions.
diff --git a/executable_semantics/ast/BUILD b/executable_semantics/ast/BUILD
@@ -37,7 +37,7 @@ cc_library(
         ":pattern",
         ":source_location",
         "//common:ostream",
-        "//executable_semantics/common:ptr",
+        "//executable_semantics/common:nonnull",
         "@llvm-project//llvm:Support",
     ],
 )

diff --git a/executable_semantics/ast/ast.h b/executable_semantics/ast/ast.h
@@ -9,7 +9,7 @@
 
 #include "executable_semantics/ast/declaration.h"
 #include "executable_semantics/ast/library_name.h"
-#include "executable_semantics/common/ptr.h"
+#include "executable_semantics/common/nonnull.h"
 
 namespace Carbon {
 

diff --git a/executable_semantics/ast/declaration.h b/executable_semantics/ast/declaration.h
@@ -14,7 +14,7 @@
 #include "executable_semantics/ast/member.h"
 #include "executable_semantics/ast/pattern.h"
 #include "executable_semantics/ast/source_location.h"
-#include "executable_semantics/common/ptr.h"
+#include "executable_semantics/common/nonnull.h"
 #include "llvm/Support/Compiler.h"
 
 namespace Carbon {

diff --git a/executable_semantics/ast/source_location.h b/executable_semantics/ast/source_location.h
@@ -9,7 +9,7 @@
 #include <string_view>
 
 #include "common/ostream.h"
-#include "executable_semantics/common/ptr.h"
+#include "executable_semantics/common/nonnull.h"
 
 namespace Carbon {
 

diff --git a/executable_semantics/common/BUILD b/executable_semantics/common/BUILD
@@ -8,7 +8,7 @@ cc_library(
     name = "arena",
     hdrs = ["arena.h"],
     deps = [
-        ":ptr",
+        ":nonnull",
     ],
 )
 
@@ -31,8 +31,8 @@ cc_test(
 )
 
 cc_library(
-    name = "ptr",
-    hdrs = ["ptr.h"],
+    name = "nonnull",
+    hdrs = ["nonnull.h"],
     deps = [
         "//common:check",
         "@llvm-project//llvm:Support",

diff --git a/executable_semantics/common/arena.h b/executable_semantics/common/arena.h
@@ -8,7 +8,7 @@
 #include <memory>
 #include <vector>
 
-#include "executable_semantics/common/ptr.h"
+#include "executable_semantics/common/nonnull.h"
 
 namespace Carbon {
 

diff --git a/executable_semantics/common/ptr.h → executable_semantics/common/nonnull.h b/executable_semantics/common/ptr.h → executable_semantics/common/nonnull.h
@@ -2,8 +2,8 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef EXECUTABLE_SEMANTICS_COMMON_PTR_H_
-#define EXECUTABLE_SEMANTICS_COMMON_PTR_H_
+#ifndef EXECUTABLE_SEMANTICS_COMMON_NONNULL_H_
+#define EXECUTABLE_SEMANTICS_COMMON_NONNULL_H_
 
 #include <type_traits>
 
@@ -19,4 +19,4 @@ using Nonnull = T _Nonnull;
 
 }  // namespace Carbon
 
-#endif  // EXECUTABLE_SEMANTICS_COMMON_PTR_H_
+#endif  // EXECUTABLE_SEMANTICS_COMMON_NONNULL_H_
diff --git a/executable_semantics/interpreter/type_checker.h b/executable_semantics/interpreter/type_checker.h
@@ -10,7 +10,7 @@
 #include "common/ostream.h"
 #include "executable_semantics/ast/expression.h"
 #include "executable_semantics/ast/statement.h"
-#include "executable_semantics/common/ptr.h"
+#include "executable_semantics/common/nonnull.h"
 #include "executable_semantics/interpreter/dictionary.h"
 #include "executable_semantics/interpreter/interpreter.h"
 

diff --git a/executable_semantics/interpreter/value.h b/executable_semantics/interpreter/value.h
@@ -13,7 +13,7 @@
 #include "common/ostream.h"
 #include "executable_semantics/ast/function_definition.h"
 #include "executable_semantics/ast/statement.h"
-#include "executable_semantics/common/ptr.h"
+#include "executable_semantics/common/nonnull.h"
 #include "executable_semantics/interpreter/address.h"
 #include "executable_semantics/interpreter/field_path.h"
 #include "executable_semantics/interpreter/stack.h"

diff --git a/executable_semantics/syntax/parser.ypp b/executable_semantics/syntax/parser.ypp
@@ -72,7 +72,7 @@
   #include "executable_semantics/ast/paren_contents.h"
   #include "executable_semantics/ast/pattern.h"
   #include "executable_semantics/common/arena.h"
-  #include "executable_semantics/common/ptr.h"
+  #include "executable_semantics/common/nonnull.h"
 
   namespace Carbon {
   class ParseAndLexContext;