Rename StandardLibrary() to StandardCheckerLibrary().

PiperOrigin-RevId: 693126582
google · Nov 5, 2024 · 834c7fd · 834c7fd
1 parent 61d0334
commit 834c7fd
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/checker/optional_test.cc b/checker/optional_test.cc
@@ -79,7 +79,7 @@ TEST(OptionalTest, OptSelectDoesNotAnnotateFieldType) {
   ASSERT_OK_AND_ASSIGN(
       TypeCheckerBuilder builder,
       CreateTypeCheckerBuilder(GetSharedTestingDescriptorPool()));
-  ASSERT_THAT(builder.AddLibrary(StandardLibrary()), IsOk());
+  ASSERT_THAT(builder.AddLibrary(StandardCheckerLibrary()), IsOk());
   ASSERT_THAT(builder.AddLibrary(OptionalCheckerLibrary()), IsOk());
   builder.set_container("cel.expr.conformance.proto3");
   ASSERT_OK_AND_ASSIGN(std::unique_ptr<TypeChecker> checker,
@@ -116,7 +116,7 @@ TEST_P(OptionalTest, Runner) {
       TypeCheckerBuilder builder,
       CreateTypeCheckerBuilder(GetSharedTestingDescriptorPool()));
   const TestCase& test_case = GetParam();
-  ASSERT_THAT(builder.AddLibrary(StandardLibrary()), IsOk());
+  ASSERT_THAT(builder.AddLibrary(StandardCheckerLibrary()), IsOk());
   ASSERT_THAT(builder.AddLibrary(OptionalCheckerLibrary()), IsOk());
   ASSERT_OK_AND_ASSIGN(std::unique_ptr<TypeChecker> checker,
                        std::move(builder).Build());
@@ -275,7 +275,7 @@ TEST_P(OptionalStrictNullAssignmentTest, Runner) {
       TypeCheckerBuilder builder,
       CreateTypeCheckerBuilder(GetSharedTestingDescriptorPool(), options));
   const TestCase& test_case = GetParam();
-  ASSERT_THAT(builder.AddLibrary(StandardLibrary()), IsOk());
+  ASSERT_THAT(builder.AddLibrary(StandardCheckerLibrary()), IsOk());
   ASSERT_THAT(builder.AddLibrary(OptionalCheckerLibrary()), IsOk());
   ASSERT_OK_AND_ASSIGN(std::unique_ptr<TypeChecker> checker,
                        std::move(builder).Build());

diff --git a/checker/standard_library.cc b/checker/standard_library.cc
@@ -1088,5 +1088,7 @@ absl::Status AddStandardLibraryDecls(TypeCheckerBuilder& builder) {
 }  // namespace
 
 // Returns a CheckerLibrary containing all of the standard CEL declarations.
-CheckerLibrary StandardLibrary() { return {"stdlib", AddStandardLibraryDecls}; }
+CheckerLibrary StandardCheckerLibrary() {
+  return {"stdlib", AddStandardLibraryDecls};
+}
 }  // namespace cel
diff --git a/checker/standard_library.h b/checker/standard_library.h
@@ -19,7 +19,7 @@
 namespace cel {
 
 // Returns a CheckerLibrary containing all of the standard CEL declarations.
-CheckerLibrary StandardLibrary();
+CheckerLibrary StandardCheckerLibrary();
 
 }  // namespace cel
 

diff --git a/checker/standard_library_test.cc b/checker/standard_library_test.cc
@@ -52,16 +52,16 @@ TEST(StandardLibraryTest, StandardLibraryAddsDecls) {
   ASSERT_OK_AND_ASSIGN(
       TypeCheckerBuilder builder,
       CreateTypeCheckerBuilder(GetSharedTestingDescriptorPool()));
-  EXPECT_THAT(builder.AddLibrary(StandardLibrary()), IsOk());
+  EXPECT_THAT(builder.AddLibrary(StandardCheckerLibrary()), IsOk());
   EXPECT_THAT(std::move(builder).Build(), IsOk());
 }
 
 TEST(StandardLibraryTest, StandardLibraryErrorsIfAddedTwice) {
   ASSERT_OK_AND_ASSIGN(
       TypeCheckerBuilder builder,
       CreateTypeCheckerBuilder(GetSharedTestingDescriptorPool()));
-  EXPECT_THAT(builder.AddLibrary(StandardLibrary()), IsOk());
-  EXPECT_THAT(builder.AddLibrary(StandardLibrary()),
+  EXPECT_THAT(builder.AddLibrary(StandardCheckerLibrary()), IsOk());
+  EXPECT_THAT(builder.AddLibrary(StandardCheckerLibrary()),
               StatusIs(absl::StatusCode::kAlreadyExists));
 }
 
@@ -70,7 +70,7 @@ TEST(StandardLibraryTest, ComprehensionVarsIndirectCyclicParamAssignability) {
   ASSERT_OK_AND_ASSIGN(
       TypeCheckerBuilder builder,
       CreateTypeCheckerBuilder(GetSharedTestingDescriptorPool()));
-  ASSERT_THAT(builder.AddLibrary(StandardLibrary()), IsOk());
+  ASSERT_THAT(builder.AddLibrary(StandardCheckerLibrary()), IsOk());
 
   // Note: this is atypical -- parameterized variables aren't well supported
   // outside of built-in syntax.
@@ -110,7 +110,7 @@ class StandardLibraryDefinitionsTest : public ::testing::Test {
     ASSERT_OK_AND_ASSIGN(
         TypeCheckerBuilder builder,
         CreateTypeCheckerBuilder(GetSharedTestingDescriptorPool()));
-    ASSERT_THAT(builder.AddLibrary(StandardLibrary()), IsOk());
+    ASSERT_THAT(builder.AddLibrary(StandardCheckerLibrary()), IsOk());
     ASSERT_OK_AND_ASSIGN(stdlib_type_checker_, std::move(builder).Build());
   }
 
@@ -215,7 +215,7 @@ TEST_P(StdLibDefinitionsTest, Runner) {
       TypeCheckerBuilder builder,
       CreateTypeCheckerBuilder(GetSharedTestingDescriptorPool(),
                                GetParam().options));
-  ASSERT_THAT(builder.AddLibrary(StandardLibrary()), IsOk());
+  ASSERT_THAT(builder.AddLibrary(StandardCheckerLibrary()), IsOk());
   ASSERT_OK_AND_ASSIGN(std::unique_ptr<TypeChecker> type_checker,
                        std::move(builder).Build());
 

diff --git a/conformance/service.cc b/conformance/service.cc
@@ -638,7 +638,7 @@ class ModernConformanceServiceImpl : public ConformanceServiceInterface {
                              google::protobuf::DescriptorPool::generated_pool()));
 
     if (!request.no_std_env()) {
-      CEL_RETURN_IF_ERROR(builder.AddLibrary(cel::StandardLibrary()));
+      CEL_RETURN_IF_ERROR(builder.AddLibrary(cel::StandardCheckerLibrary()));
       CEL_RETURN_IF_ERROR(builder.AddLibrary(cel::OptionalCheckerLibrary()));
     }