commit 773b95f947fbba51185db6548ba63c2008bed8ec
author gregce <gregce@google.com> Tue May 19 09:51:09 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Tue May 19 09:52:15 2020 -0700
tree 22512c47e6b6fbbf52e47a329bf790d4d4238cda
parent 3b2843021702086568e896ebab6e40657a40025f

Skylark -> Starlark for various methods, variables, constants, etc.

PiperOrigin-RevId: 312298717

src/main/java/com/google/devtools/build/lib/analysis/BuildView.java

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
index 76f5c89..1bde506 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
@@ -322,9 +322,9 @@
             bzlFileLoadLikeString = bzlFileLoadLikeString + ".bzl";
           }
         }
-        Label skylarkFileLabel;
+        Label starlarkFileLabel;
         try {
-          skylarkFileLabel =
+          starlarkFileLabel =
               Label.parseAbsolute(
                   bzlFileLoadLikeString, /* repositoryMapping= */ ImmutableMap.of());
         } catch (LabelSyntaxException e) {
@@ -332,7 +332,7 @@
               String.format("Invalid aspect '%s': %s", aspect, e.getMessage()), e);
         }
 
-        String skylarkFunctionName = aspect.substring(delimiterPosition + 1);
+        String starlarkFunctionName = aspect.substring(delimiterPosition + 1);
         for (TargetAndConfiguration targetSpec : topLevelTargetsWithConfigs) {
           if (targetSpec.getConfiguration() != null
               && targetSpec.getConfiguration().trimConfigurationsRetroactively()) {
@@ -348,8 +348,8 @@
                   // aspect and the base target while the top-level configuration is untrimmed.
                   targetSpec.getConfiguration(),
                   targetSpec.getConfiguration(),
-                  skylarkFileLabel,
-                  skylarkFunctionName));
+                  starlarkFileLabel,
+                  starlarkFunctionName));
         }
       } else {
         final NativeAspectClass aspectFactoryClass =