commit 74d84d43b0b810e7eb2c8f866694fa2dcf209baa
author gregce <gregce@google.com> Fri Apr 17 10:02:03 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Apr 17 10:03:12 2020 -0700
tree eef4c2a721c3742c52c4589c00ab2459abdac3b6
parent 1523e3b0a227e6a37a639fb53f9e5a27e6da46cd

The great Skylark -> Starlark class migration:
  SkylarkRuleClassSerializer
  SkylarkProviderIdentifierCodecTest
  SkylarkProviderIdentifier

Rough algorithm:
 - Convert these class names
 - Convert methods, variables, other symbols encountered in the files these
 classes are defined in.
- *Don't* replace class names for classes defined in other files. These will
 be handled in their own order. This helps keep individual changelist scope
 small.

PiperOrigin-RevId: 307063447

src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java
index 8a59f59..e71988c 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java
@@ -44,7 +44,7 @@
 import com.google.devtools.build.lib.packages.SkylarkDefinedAspect;
 import com.google.devtools.build.lib.packages.SkylarkInfo;
 import com.google.devtools.build.lib.packages.SkylarkProvider;
-import com.google.devtools.build.lib.packages.SkylarkProviderIdentifier;
+import com.google.devtools.build.lib.packages.StarlarkProviderIdentifier;
 import com.google.devtools.build.lib.packages.StructImpl;
 import com.google.devtools.build.lib.packages.StructProvider;
 import com.google.devtools.build.lib.packages.Type;
@@ -295,12 +295,12 @@
     assertThat(attr.isSingleArtifact()).isTrue();
   }
 
-  private static SkylarkProviderIdentifier legacy(String legacyId) {
-    return SkylarkProviderIdentifier.forLegacy(legacyId);
+  private static StarlarkProviderIdentifier legacy(String legacyId) {
+    return StarlarkProviderIdentifier.forLegacy(legacyId);
   }
 
-  private static SkylarkProviderIdentifier declared(String exportedName) {
-    return SkylarkProviderIdentifier.forKey(
+  private static StarlarkProviderIdentifier declared(String exportedName) {
+    return StarlarkProviderIdentifier.forKey(
         new SkylarkProvider.SkylarkKey(FAKE_LABEL, exportedName));
   }
 
@@ -335,9 +335,9 @@
     assertThat(attr.getRequiredProviders().isSatisfiedBy(set(legacy("a")))).isFalse();
   }
 
-  private static AdvertisedProviderSet set(SkylarkProviderIdentifier... ids) {
+  private static AdvertisedProviderSet set(StarlarkProviderIdentifier... ids) {
     AdvertisedProviderSet.Builder builder = AdvertisedProviderSet.builder();
-    for (SkylarkProviderIdentifier id : ids) {
+    for (StarlarkProviderIdentifier id : ids) {
       builder.addSkylark(id);
     }
     return builder.build();