Starlark -> Skylark: final push for comment changes (1 of 2)
This is the final result of IntelliJ find/replace refactoring
scoped over the Blaze project, not including symbols.
Split into two parts because of the total number of files
is an unwieldy 358.
PiperOrigin-RevId: 306447566
diff --git a/WORKSPACE b/WORKSPACE
index cd0eb77..f24f7a8 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -87,7 +87,7 @@
# load("//tools/build_defs/repo:maven_rules.bzl", "maven_dependency_plugin")
# maven_dependency_plugin()
-# This allows rules written in skylark to locate apple build tools.
+# This allows rules written in Starlark to locate apple build tools.
bind(
name = "xcrunwrapper",
actual = "@bazel_tools//tools/objc:xcrunwrapper",
diff --git a/examples/java-skylark/README.md b/examples/java-skylark/README.md
index 8a3eea1..ea0553d 100644
--- a/examples/java-skylark/README.md
+++ b/examples/java-skylark/README.md
@@ -1,5 +1,5 @@
-# Skylark Java Examples
+# Starlark Java Examples
Use the native Java rules (see the examples in _examples/java-native_) for
-building Java, not these. These files are examples of how Skylark rules can be
+building Java, not these. These files are examples of how Starlark rules can be
used (see _tools/build_rules/java_rules_skylark.bzl_ for the rule definitions).
diff --git a/site/_sass/be.scss b/site/_sass/be.scss
index 0e7e899..875c603 100644
--- a/site/_sass/be.scss
+++ b/site/_sass/be.scss
@@ -1,4 +1,4 @@
-// Build Encyclopedia and Skylark Library
+// Build Encyclopedia and Starlark Library
pre.rule-signature {
white-space: normal;
diff --git a/site/docs/guide.html b/site/docs/guide.html
index 42dc848..62dceb3 100644
--- a/site/docs/guide.html
+++ b/site/docs/guide.html
@@ -1406,7 +1406,7 @@
<li><a href='user-manual.html#flag--html_details'><code>--html_details</code></a>
<p>
Additionally passing this option will render a more detailed execution chart and additional
- tables on the performance of built-in and user-defined Skylark functions. Beware that this
+ tables on the performance of built-in and user-defined Starlark functions. Beware that this
increases the file size and the load on the browser considerably.
</p>
</li>
diff --git a/site/docs/query.html b/site/docs/query.html
index c959d91..69749fc 100644
--- a/site/docs/query.html
+++ b/site/docs/query.html
@@ -566,7 +566,7 @@
<code>deps(foo/...)</code> is the dependency graphs whose roots are
all rules in every package beneath the <code>foo</code> directory.
Please note that 'dependencies' means only rule and file targets
- in this context, therefore the BUILD and Skylark files needed to
+ in this context, therefore the BUILD and Starlark files needed to
create these targets are not included here. For that you should use the
<a href="#buildfiles"><code>buildfiles</code></a> operator.
</p>
@@ -1089,7 +1089,7 @@
<pre>expr ::= loadfiles(<var>expr</var>)</pre>
<p>
The <code>loadfiles(<var>x</var>)</code> operator returns the set of
- Skylark files that are needed to load the packages of each target in
+ Starlark files that are needed to load the packages of each target in
set <var>x</var>. In other words, for each package, it returns the
.bzl files that are referenced from its BUILD files.
</p>
@@ -1170,7 +1170,7 @@
With this option, the representation of each target is as if it were
hand-written in the BUILD language. All variables and function calls
(e.g. glob, macros) are expanded, which is useful for seeing the effect
- of Skylark macros. Additionally, each effective rule is annotated with
+ of Starlark macros. Additionally, each effective rule is annotated with
the name of the macro (if any, see <code>generator_name</code> and
<code>generator_function</code>) that produced it.
</p>
diff --git a/site/docs/skylark/config.md b/site/docs/skylark/config.md
index 7123e8f..254cfdf 100644
--- a/site/docs/skylark/config.md
+++ b/site/docs/skylark/config.md
@@ -36,7 +36,7 @@
* [#5577](https://github.com/bazelbuild/bazel/issues/5577) - Starlark support
for custom build flags
* [#5578](https://github.com/bazelbuild/bazel/issues/5578) - Configuration
- doesn't block native to Skylark rules migration
+ doesn't block native to Starlark rules migration
## User-defined build settings
A build setting is a single piece of
diff --git a/site/docs/skylark/performance.md b/site/docs/skylark/performance.md
index a9b4d08..b5d2151 100644
--- a/site/docs/skylark/performance.md
+++ b/site/docs/skylark/performance.md
@@ -414,7 +414,7 @@
```
$ bazel $(STARTUP_FLAGS) dump --skylark_memory=$HOME/prof.gz
-> Dumping skylark heap to: /usr/local/google/home/$USER/prof.gz
+> Dumping Starlark heap to: /usr/local/google/home/$USER/prof.gz
```
Next, we use the `pprof` tool to investigate the heap. A good starting point is
diff --git a/site/docs/user-manual.html b/site/docs/user-manual.html
index 57ba491..bb8d173 100644
--- a/site/docs/user-manual.html
+++ b/site/docs/user-manual.html
@@ -1567,7 +1567,7 @@
<h4 id="flag--toolchain_resolution_debug"><code class='flag'>--toolchain_resolution_debug=false</code></h4>
<p>
Print debug information while finding toolchains for a rule. This might help
- developers of Bazel or Skylark rules with debugging failures due to missing
+ developers of Bazel or Starlark rules with debugging failures due to missing
toolchains.
</p>
@@ -2573,7 +2573,7 @@
<li><code class='flag'>--packages</code> dumps package cache content.</li>
<li><code class='flag'>--skyframe</code> dumps state of internal Bazel dependency graph.</li>
<li><code class='flag'>--rules</code> dumps rule summary for each rule and aspect class,
- including counts and action counts. This includes both native and Skylark rules.
+ including counts and action counts. This includes both native and Starlark rules.
If memory tracking is enabled, then the rules' memory consumption is also printed.</li>
<li><code class='flag'>--skylark_memory</code> dumps a
<href a=https://github.com/google/pprof>pprof</href> compatible .gz file to the specified path.
@@ -2620,7 +2620,7 @@
--host_jvm_args=-DRULE_MEMORY_TRACKER=1 \
dump --rules
- # Dump Skylark heap and analyze it with pprof
+ # Dump Starlark heap and analyze it with pprof
% bazel --host_jvm_args=-javaagent:$BAZEL/third_party/allocation_instrumenter/java-allocation-instrumenter-3.0.1.jar \
--host_jvm_args=-DRULE_MEMORY_TRACKER=1 \
dump --skylark_memory=$HOME/prof.gz
diff --git a/site/docs/workspace-log.md b/site/docs/workspace-log.md
index e25f926..15da79b 100644
--- a/site/docs/workspace-log.md
+++ b/site/docs/workspace-log.md
@@ -44,7 +44,7 @@
* Sometimes functions might be re-executed, in which case the related
events will show up in the log multiple times.
-* Workspace rules log currently only logs Skylark events. Some native rules
+* Workspace rules log currently only logs Starlark events. Some native rules
may cause non-hermetic behavior but not show up in this log. Examples of those
rules include
[maven_jar](/be/workspace.html#maven_jar).
diff --git a/site/jekyll-tree.sh b/site/jekyll-tree.sh
index 0f9d383..3f2d777 100755
--- a/site/jekyll-tree.sh
+++ b/site/jekyll-tree.sh
@@ -15,7 +15,7 @@
# This script constructs the final Jekyll tree by combining the static Jekyll
# site files with generated documentation, such as the Build Encyclopedia and
-# Skylark Library. It then constructs the site directory structure for
+# Starlark Library. It then constructs the site directory structure for
# Bazel documentation at HEAD by moving all documentation into the
# /versions/master directory and adding redirects from the root of the site.
# This way, URLs of the form https://docs.bazel.build/foo.html will be
@@ -61,7 +61,7 @@
unzip -qq "$BE_ZIP" -d "$be_dir"
mv "$be_dir/be-nav.html" "$OUT_DIR/_includes"
- # Unpack the Skylark Library into versions/master/skylark/lib
+ # Unpack the Starlark Library into versions/master/skylark/lib
local sl_dir="$VERSION_DIR/skylark/lib"
mkdir -p "$sl_dir"
unzip -qq "$SL_ZIP" -d "$sl_dir"
@@ -76,7 +76,7 @@
cp "$CLR_HTML" "$VERSION_DIR"
}
-# Helper function for copying a Skylark rule doc.
+# Helper function for copying a Starlark rule doc.
function copy_skylark_rule_doc {
local rule_family=$1
local rule_family_name=$2
@@ -91,7 +91,7 @@
cat "$TMP/skylark/$rule_family/README.md"; ) > "$be_dir/${rule_family}.md"
}
-# Copies the READMEs for Skylark rules bundled with Bazel.
+# Copies the READMEs for Starlark rules bundled with Bazel.
function unpack_skylark_rule_docs {
local tmp_dir=$TMP/skylark
mkdir -p $tmp_dir
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD
index 9ae2038..1796e26 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD
@@ -149,7 +149,7 @@
)
#
-## Bootstrapping using Skylark rules
+## Bootstrapping using Starlark rules
#
bootstrap_java_library(
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass/BUILD b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass/BUILD
index b674633..118537f 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass/BUILD
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass/BUILD
@@ -30,7 +30,7 @@
)
#
-## Bootstrapping using Skylark rules
+## Bootstrapping using Starlark rules
#
load("//tools/build_rules:java_rules_skylark.bzl", "bootstrap_java_binary")
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper/BUILD b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper/BUILD
index e0d7795..c3145b8 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper/BUILD
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper/BUILD
@@ -17,7 +17,7 @@
)
#
-## Bootstrapping using Skylark rules
+## Bootstrapping using Starlark rules
#
load("//tools/build_rules:java_rules_skylark.bzl", "bootstrap_java_library")
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/BUILD b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/BUILD
index fa6df3e..2860ef9 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/BUILD
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/BUILD
@@ -63,7 +63,7 @@
)
#
-## Bootstrapping using Skylark rules
+## Bootstrapping using Starlark rules
#
load("//tools/build_rules:java_rules_skylark.bzl", "bootstrap_java_library")
diff --git a/src/java_tools/singlejar/java/com/google/devtools/build/singlejar/BUILD b/src/java_tools/singlejar/java/com/google/devtools/build/singlejar/BUILD
index 402c4fb..dcd68cc 100644
--- a/src/java_tools/singlejar/java/com/google/devtools/build/singlejar/BUILD
+++ b/src/java_tools/singlejar/java/com/google/devtools/build/singlejar/BUILD
@@ -70,7 +70,7 @@
)
#
-# Bootstrapping using Skylark rules
+# Bootstrapping using Starlark rules
#
bootstrap_java_library(
diff --git a/src/main/java/com/google/devtools/build/docgen/ApiExporter.java b/src/main/java/com/google/devtools/build/docgen/ApiExporter.java
index 00c6bf2..0d43f1b 100644
--- a/src/main/java/com/google/devtools/build/docgen/ApiExporter.java
+++ b/src/main/java/com/google/devtools/build/docgen/ApiExporter.java
@@ -42,7 +42,7 @@
import java.util.Map;
import java.util.Map.Entry;
-/** The main class for the Skylark documentation generator. */
+/** The main class for the Starlark documentation generator. */
public class ApiExporter {
private static void appendTypes(
diff --git a/src/main/java/com/google/devtools/build/docgen/DocCheckerUtils.java b/src/main/java/com/google/devtools/build/docgen/DocCheckerUtils.java
index 0388897..22f4ea6 100644
--- a/src/main/java/com/google/devtools/build/docgen/DocCheckerUtils.java
+++ b/src/main/java/com/google/devtools/build/docgen/DocCheckerUtils.java
@@ -54,7 +54,7 @@
return getFirstUnclosedTag(src, false);
}
- // TODO(bazel-team): run this on the Skylark docs too.
+ // TODO(bazel-team): run this on the Starlark docs too.
private static String getFirstUnclosedTag(String src, boolean printHelp) {
Matcher commentMatcher = COMMENT_PATTERN.matcher(src);
src = commentMatcher.replaceAll("");
diff --git a/src/main/java/com/google/devtools/build/docgen/SkylarkDocumentationCollector.java b/src/main/java/com/google/devtools/build/docgen/SkylarkDocumentationCollector.java
index 44863ac..83d6760 100644
--- a/src/main/java/com/google/devtools/build/docgen/SkylarkDocumentationCollector.java
+++ b/src/main/java/com/google/devtools/build/docgen/SkylarkDocumentationCollector.java
@@ -30,9 +30,7 @@
import java.util.TreeMap;
import javax.annotation.Nullable;
-/**
- * A helper class that collects Skylark module documentation.
- */
+/** A helper class that collects Starlark module documentation. */
final class SkylarkDocumentationCollector {
@SkylarkModule(
name = "globals",
@@ -43,16 +41,14 @@
private SkylarkDocumentationCollector() {}
- /**
- * Returns the SkylarkModule annotation for the top-level Skylark module.
- */
+ /** Returns the SkylarkModule annotation for the top-level Starlark module. */
public static SkylarkModule getTopLevelModule() {
return TopLevelModule.class.getAnnotation(SkylarkModule.class);
}
/**
- * Collects the documentation for all Skylark modules comprised of the given classes and returns a
- * map that maps Skylark module name to the module documentation.
+ * Collects the documentation for all Starlark modules comprised of the given classes and returns
+ * a map that maps Starlark module name to the module documentation.
*/
public static Map<String, SkylarkModuleDoc> collectModules(Iterable<Class<?>> classes) {
Map<String, SkylarkModuleDoc> modules = new TreeMap<>();
diff --git a/src/main/java/com/google/devtools/build/docgen/SkylarkDocumentationGenerator.java b/src/main/java/com/google/devtools/build/docgen/SkylarkDocumentationGenerator.java
index f348325..3f819d9 100644
--- a/src/main/java/com/google/devtools/build/docgen/SkylarkDocumentationGenerator.java
+++ b/src/main/java/com/google/devtools/build/docgen/SkylarkDocumentationGenerator.java
@@ -16,9 +16,7 @@
import java.util.Arrays;
-/**
- * The main class for the skylark documentation generator.
- */
+/** The main class for the Starlark documentation generator. */
public class SkylarkDocumentationGenerator {
private static boolean checkArgs(String[] args) {
diff --git a/src/main/java/com/google/devtools/build/docgen/SkylarkDocumentationProcessor.java b/src/main/java/com/google/devtools/build/docgen/SkylarkDocumentationProcessor.java
index c83b254..eb4ae6a 100644
--- a/src/main/java/com/google/devtools/build/docgen/SkylarkDocumentationProcessor.java
+++ b/src/main/java/com/google/devtools/build/docgen/SkylarkDocumentationProcessor.java
@@ -31,23 +31,19 @@
import java.util.Locale;
import java.util.Map;
-/**
- * A class to assemble documentation for Skylark.
- */
+/** A class to assemble documentation for Starlark. */
public final class SkylarkDocumentationProcessor {
private static final ImmutableList<SkylarkModuleCategory> GLOBAL_CATEGORIES =
ImmutableList.<SkylarkModuleCategory>of(
SkylarkModuleCategory.NONE, SkylarkModuleCategory.TOP_LEVEL_TYPE);
- // Common prefix of packages that may contain Skylark modules.
+ // Common prefix of packages that may contain Starlark modules.
@VisibleForTesting static final String MODULES_PACKAGE_PREFIX = "com/google/devtools/build";
private SkylarkDocumentationProcessor() {}
- /**
- * Generates the Skylark documentation to the given output directory.
- */
+ /** Generates the Starlark documentation to the given output directory. */
public static void generateDocumentation(String outputDir, String... args)
throws IOException, ClassPathException {
parseOptions(args);
diff --git a/src/main/java/com/google/devtools/build/docgen/SymbolFamilies.java b/src/main/java/com/google/devtools/build/docgen/SymbolFamilies.java
index da5c83d..9dedb0f 100644
--- a/src/main/java/com/google/devtools/build/docgen/SymbolFamilies.java
+++ b/src/main/java/com/google/devtools/build/docgen/SymbolFamilies.java
@@ -87,7 +87,7 @@
* builtin types.
*/
public class SymbolFamilies {
- // Common prefix of packages that may contain Skylark modules.
+ // Common prefix of packages that may contain Starlark modules.
private static final String MODULES_PACKAGE_PREFIX = "com/google/devtools/build";
private final ImmutableList<RuleDocumentation> nativeRules;
diff --git a/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkConstructorMethodDoc.java b/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkConstructorMethodDoc.java
index 8f861ae..a548465 100644
--- a/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkConstructorMethodDoc.java
+++ b/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkConstructorMethodDoc.java
@@ -21,9 +21,8 @@
import java.util.List;
/**
- * A class representing a Java method callable from Skylark which constructs a type of
- * skylark object. Such a method is annotated with {@link SkylarkConstructor}, and has special
- * handling.
+ * A class representing a Java method callable from Starlark which constructs a type of Starlark
+ * object. Such a method is annotated with {@link SkylarkConstructor}, and has special handling.
*/
public final class SkylarkConstructorMethodDoc extends SkylarkMethodDoc {
private final String fullyQualifiedName;
diff --git a/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkDoc.java b/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkDoc.java
index 25a199d..1923bd3 100644
--- a/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkDoc.java
+++ b/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkDoc.java
@@ -28,9 +28,7 @@
import java.util.Arrays;
import java.util.Map;
-/**
- * Abstract class for containing documentation for a Skylark syntactic entity.
- */
+/** Abstract class for containing documentation for a Starlark syntactic entity. */
abstract class SkylarkDoc {
protected static final String TOP_LEVEL_ID = "globals";
diff --git a/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkJavaMethodDoc.java b/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkJavaMethodDoc.java
index c85c5aa..019babc 100644
--- a/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkJavaMethodDoc.java
+++ b/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkJavaMethodDoc.java
@@ -24,9 +24,7 @@
import java.util.ArrayList;
import java.util.List;
-/**
- * A class representing a Java method callable from Skylark with annotation.
- */
+/** A class representing a Java method callable from Starlark with annotation. */
public final class SkylarkJavaMethodDoc extends SkylarkMethodDoc {
private final String moduleName;
private final String name;
diff --git a/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkMethodDoc.java b/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkMethodDoc.java
index d40d643..4519615 100644
--- a/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkMethodDoc.java
+++ b/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkMethodDoc.java
@@ -22,11 +22,9 @@
import java.util.ArrayList;
import java.util.List;
-/**
- * An abstract class containing documentation for a Skylark method.
- */
+/** An abstract class containing documentation for a Starlark method. */
public abstract class SkylarkMethodDoc extends SkylarkDoc {
- /** Returns whether the Skylark method is documented. */
+ /** Returns whether the Starlark method is documented. */
public abstract boolean documented();
/**
@@ -94,8 +92,8 @@
}
/**
- * Returns a string representing the method signature of the Skylark method, which contains
- * HTML links to the documentation of parameter types if available.
+ * Returns a string representing the method signature of the Starlark method, which contains HTML
+ * links to the documentation of parameter types if available.
*/
public abstract String getSignature();
diff --git a/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkModuleDoc.java b/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkModuleDoc.java
index 4a59a17..67460e3 100644
--- a/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkModuleDoc.java
+++ b/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkModuleDoc.java
@@ -28,7 +28,7 @@
import javax.annotation.Nullable;
/**
- * A class representing documentation for a Skylark built-in object with its {@link SkylarkModule}
+ * A class representing documentation for a Starlark built-in object with its {@link SkylarkModule}
* annotation and with the {@link SkylarkCallable} methods it documents.
*/
public final class SkylarkModuleDoc extends SkylarkDoc {
diff --git a/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkParamDoc.java b/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkParamDoc.java
index d0ef996..fe9aa8d 100644
--- a/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkParamDoc.java
+++ b/src/main/java/com/google/devtools/build/docgen/skylark/SkylarkParamDoc.java
@@ -16,9 +16,7 @@
import com.google.devtools.build.lib.skylarkinterface.Param;
import com.google.devtools.build.lib.skylarkinterface.ParamType;
-/**
- * A class containing the documentation for a Skylark method parameter.
- */
+/** A class containing the documentation for a Starlark method parameter. */
public final class SkylarkParamDoc extends SkylarkDoc {
private SkylarkMethodDoc method;
private Param param;
diff --git a/src/main/java/com/google/devtools/build/lib/actions/CommandLineExpansionException.java b/src/main/java/com/google/devtools/build/lib/actions/CommandLineExpansionException.java
index 91eebee..7954c04 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/CommandLineExpansionException.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/CommandLineExpansionException.java
@@ -19,7 +19,7 @@
*
* <p>This exception should be thrown deterministically, i.e. the command line should fail to expand
* in exactly the same way every time at attempt is made. An example would be an illegal format
- * string, or a failure in Skylark evaluation of a compact command line.
+ * string, or a failure in Starlark evaluation of a compact command line.
*/
public final class CommandLineExpansionException extends Exception {
/** @param userVisibleErrorMessage An error string that will be displayed to the user. */
diff --git a/src/main/java/com/google/devtools/build/lib/actions/CommandLineItem.java b/src/main/java/com/google/devtools/build/lib/actions/CommandLineItem.java
index 6445e43..2861670 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/CommandLineItem.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/CommandLineItem.java
@@ -77,7 +77,7 @@
static String expandToCommandLine(Object object) {
// TODO(b/150322434): The fallback on toString() isn't great. Particularly so for
// SkylarkCustomCommandLine, since toString() does not necessarily give the same results as
- // Skylark's str() or repr().
+ // Starlark's str() or repr().
//
// The ideal refactoring is to make StarlarkValue implement CommandLineItem (or a slimmer
// version
@@ -87,7 +87,7 @@
// involve a Printer.
//
// Since StarlarkValue should be moved out of Bazel, this refactoring would be blocked on making
- // a BuildStarlarkValue subinterface for Bazel-specific Skylark types. It would then be
+ // a BuildStarlarkValue subinterface for Bazel-specific Starlark types. It would then be
// BuildStarlarkValue, rather than StarlarkValue, that extends CommandLineItem.
if (object instanceof CommandLineItem) {
return ((CommandLineItem) object).expandToCommandLine();
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisEnvironment.java b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisEnvironment.java
index 23eeb05..1c92d32 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisEnvironment.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisEnvironment.java
@@ -147,7 +147,7 @@
SkyFunction.Environment getSkyframeEnv();
/**
- * Returns the options that affect the Skylark interpreter used for evaluating Skylark rule
+ * Returns the options that affect the Starlark interpreter used for evaluating Starlark rule
* implementation functions.
*/
StarlarkSemantics getSkylarkSemantics() throws InterruptedException;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisUtils.java b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisUtils.java
index 8d7f5e7..a6ccf45 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisUtils.java
@@ -89,8 +89,8 @@
}
/**
- * Returns the list of declared providers (native and Skylark) of the specified Skylark key from a
- * set of transitive info collections.
+ * Returns the list of declared providers (native and Starlark) of the specified Starlark key from
+ * a set of transitive info collections.
*/
public static <T extends Info> List<T> getProviders(
Iterable<? extends TransitiveInfoCollection> prerequisites,
@@ -106,8 +106,8 @@
}
/**
- * Returns the list of declared providers (native and Skylark) of the specified Skylark key from a
- * set of transitive info collections.
+ * Returns the list of declared providers (native and Starlark) of the specified Starlark key from
+ * a set of transitive info collections.
*/
public static <T extends Info> List<T> getProviders(
Iterable<? extends TransitiveInfoCollection> prerequisites,
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java b/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java
index afe66d7..e125898 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java
@@ -264,9 +264,7 @@
*/
public static final String TAGGED_TRIMMING_ATTR = "transitive_configs";
- /**
- * Share common attributes across both base and Skylark base rules.
- */
+ /** Share common attributes across both base and Starlark base rules. */
public static RuleClass.Builder commonCoreAndSkylarkAttributes(RuleClass.Builder builder) {
return builder
// The visibility attribute is special: it is a nodep label, and loading the
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 2737c96..d28875b 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
@@ -300,7 +300,7 @@
// Syntax: label%aspect
int delimiterPosition = aspect.indexOf('%');
if (delimiterPosition >= 0) {
- // TODO(jfield): For consistency with Skylark loads, the aspect should be specified
+ // TODO(jfield): For consistency with Starlark loads, the aspect should be specified
// as an absolute label.
// We convert it for compatibility reasons (this will be removed in the future).
String bzlFileLoadLikeString = aspect.substring(0, delimiterPosition);
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java b/src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java
index 260dd94..a20402d 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java
@@ -243,11 +243,8 @@
return values;
}
- /**
- * Resolves a command, and expands known locations for $(location)
- * variables.
- */
- @Deprecated // Only exists to support a legacy Skylark API.
+ /** Resolves a command, and expands known locations for $(location) variables. */
+ @Deprecated // Only exists to support a legacy Starlark API.
public String resolveCommandAndExpandLabels(
String command, @Nullable String attribute, boolean allowDataInLabel) {
LocationExpander expander;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfigurationMakeVariableContext.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfigurationMakeVariableContext.java
index 33a784f..1fb2786 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/ConfigurationMakeVariableContext.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfigurationMakeVariableContext.java
@@ -65,7 +65,7 @@
private final ImmutableList<? extends MakeVariableSupplier> allMakeVariableSuppliers;
- // TODO(b/37567440): Remove when Skylark callers can be updated to get this from
+ // TODO(b/37567440): Remove when Starlark callers can be updated to get this from
// CcToolchainProvider. We should use CcCommon.CC_TOOLCHAIN_ATTRIBUTE_NAME, but we didn't want to
// pollute core with C++ specific constant.
protected static final ImmutableList<String> DEFAULT_MAKE_VARIABLE_ATTRIBUTES =
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java
index 55ef8ab..daacff4 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java
@@ -216,7 +216,7 @@
/**
* Adds a configuration fragment factory and all build options required by its fragment.
*
- * <p>Note that configuration fragments annotated with a Skylark name must have a unique name;
+ * <p>Note that configuration fragments annotated with a Starlark name must have a unique name;
* no two different configuration fragments can share the same name.
*/
public Builder addConfigurationFragment(ConfigurationFragmentFactory factory) {
@@ -858,7 +858,7 @@
return fragmentsBuilder.build();
}
- /** Returns a reserved set of action mnemonics. These cannot be used from a Skylark action. */
+ /** Returns a reserved set of action mnemonics. These cannot be used from a Starlark action. */
public ImmutableSet<String> getReservedActionMnemonics() {
return reservedActionMnemonics;
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/DefaultInfo.java b/src/main/java/com/google/devtools/build/lib/analysis/DefaultInfo.java
index 4f7fe0b..d6db2dd 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/DefaultInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/DefaultInfo.java
@@ -106,7 +106,7 @@
@Override
public Runfiles getDefaultRunfiles() {
if (dataRunfiles == null && defaultRunfiles == null) {
- // This supports the legacy skylark runfiles constructor -- if the 'runfiles' attribute
+ // This supports the legacy Starlark runfiles constructor -- if the 'runfiles' attribute
// is used, then default_runfiles will return all runfiles.
return runfiles;
} else {
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/EventHandlingErrorReporter.java b/src/main/java/com/google/devtools/build/lib/analysis/EventHandlingErrorReporter.java
index dad0519..326d3f4 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/EventHandlingErrorReporter.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/EventHandlingErrorReporter.java
@@ -26,7 +26,7 @@
*
* <p>Do not create new implementations of this class - instead, use {@link RuleContext} in Native
* rule definitions, and {@link com.google.devtools.build.lib.analysis.skylark.SkylarkErrorReporter}
- * in Skylark API definitions. For use in testing, implement {@link RuleErrorConsumer} instead.
+ * in Starlark API definitions. For use in testing, implement {@link RuleErrorConsumer} instead.
*/
public abstract class EventHandlingErrorReporter implements RuleErrorConsumer {
private final String ruleClassNameForLogging;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/FilesToRunProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/FilesToRunProvider.java
index cdffce4..4c66a12 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/FilesToRunProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/FilesToRunProvider.java
@@ -30,7 +30,7 @@
@AutoCodec
public final class FilesToRunProvider
implements TransitiveInfoProvider, FilesToRunProviderApi<Artifact> {
- /** The name of the field in Skylark used to access this class. */
+ /** The name of the field in Starlark used to access this class. */
public static final String SKYLARK_NAME = "files_to_run";
public static final FilesToRunProvider EMPTY =
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ProviderCollection.java b/src/main/java/com/google/devtools/build/lib/analysis/ProviderCollection.java
index a0f7e9e..a1a7c32 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/ProviderCollection.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/ProviderCollection.java
@@ -35,7 +35,7 @@
/**
* Returns the transitive information requested or null, if the information is not found. The
- * transitive information has to have been added using the Skylark framework.
+ * transitive information has to have been added using the Starlark framework.
*/
@Nullable
Object get(String providerKey);
@@ -69,8 +69,8 @@
}
/**
- * Returns the provider defined in Skylark, or null, if the information is not found. The
- * transitive information has to have been added using the Skylark framework.
+ * Returns the provider defined in Starlark, or null, if the information is not found. The
+ * transitive information has to have been added using the Starlark framework.
*
* <p>This method dispatches to either {@link #get(Provider.Key)} or {@link #get(String)}
* depending on whether {@link SkylarkProviderIdentifier} is for legacy or for declared provider.
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java b/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java
index b8decab..472f363 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java
@@ -483,10 +483,9 @@
}
/**
- * Add a Skylark transitive info. The provider value must be safe (i.e. a String, a Boolean,
- * an Integer, an Artifact, a Label, None, a Java TransitiveInfoProvider or something composed
- * from these in Skylark using lists, sets, structs or dicts). Otherwise an EvalException is
- * thrown.
+ * Add a Starlark transitive info. The provider value must be safe (i.e. a String, a Boolean, an
+ * Integer, an Artifact, a Label, None, a Java TransitiveInfoProvider or something composed from
+ * these in Starlark using lists, sets, structs or dicts). Otherwise an EvalException is thrown.
*/
public RuleConfiguredTargetBuilder addSkylarkTransitiveInfo(
String name, Object value, Location loc) throws EvalException {
@@ -495,7 +494,7 @@
}
/**
- * Adds a "declared provider" defined in Skylark to the rule. Use this method for declared
+ * Adds a "declared provider" defined in Starlark to the rule. Use this method for declared
* providers defined in Skyark.
*
* <p>Has special handling for {@link OutputGroupInfo}: that provider is not added from Skylark
@@ -525,7 +524,7 @@
* Adds "declared providers" defined in native code to the rule. Use this method for declared
* providers in definitions of native rules.
*
- * <p>Use {@link #addSkylarkDeclaredProvider(Info)} for Skylark rule implementations.
+ * <p>Use {@link #addSkylarkDeclaredProvider(Info)} for Starlark rule implementations.
*/
public RuleConfiguredTargetBuilder addNativeDeclaredProviders(Iterable<Info> providers) {
for (Info provider : providers) {
@@ -538,7 +537,7 @@
* Adds a "declared provider" defined in native code to the rule. Use this method for declared
* providers in definitions of native rules.
*
- * <p>Use {@link #addSkylarkDeclaredProvider(Info)} for Skylark rule implementations.
+ * <p>Use {@link #addSkylarkDeclaredProvider(Info)} for Starlark rule implementations.
*/
public RuleConfiguredTargetBuilder addNativeDeclaredProvider(Info provider) {
Provider constructor = provider.getProvider();
@@ -563,11 +562,8 @@
return providersBuilder.contains(legacyId);
}
- /**
- * Add a Skylark transitive info. The provider value must be safe.
- */
- public RuleConfiguredTargetBuilder addSkylarkTransitiveInfo(
- String name, Object value) {
+ /** Add a Starlark transitive info. The provider value must be safe. */
+ public RuleConfiguredTargetBuilder addSkylarkTransitiveInfo(String name, Object value) {
providersBuilder.put(name, value);
return this;
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetFactory.java
index 430a74f..b2f7a95 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetFactory.java
@@ -57,7 +57,7 @@
* produced by during the build. Not every file produced during the build has a corresponding
* output file target.
* <li>Rules. These describe things a build actually does. Each rule has a class (e.g. <code>
- * cc_binary</code>). Rule classes can be defined either in Skylark using the <code>rule()
+ * cc_binary</code>). Rule classes can be defined either in Starlark using the <code>rule()
* </code> function or in Java code by implementing {@link
* com.google.devtools.build.lib.analysis.RuleDefinition}.
*
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
index 8a8bd83..db6fdcc 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
@@ -1080,8 +1080,8 @@
}
/**
- * Returns all the declared providers (native and Skylark) for the specified constructor under the
- * specified attribute of this target in the BUILD file.
+ * Returns all the declared providers (native and Starlark) for the specified constructor under
+ * the specified attribute of this target in the BUILD file.
*/
public <T extends Info> List<T> getPrerequisites(
String attributeName, TransitionMode mode, final NativeProvider<T> skylarkKey) {
@@ -1089,8 +1089,8 @@
}
/**
- * Returns all the declared providers (native and Skylark) for the specified constructor under the
- * specified attribute of this target in the BUILD file.
+ * Returns all the declared providers (native and Starlark) for the specified constructor under
+ * the specified attribute of this target in the BUILD file.
*/
public <T extends Info> List<T> getPrerequisites(
String attributeName, TransitionMode mode, final BuiltinProvider<T> skylarkKey) {
@@ -1098,7 +1098,7 @@
}
/**
- * Returns the declared provider (native and Skylark) for the specified constructor under the
+ * Returns the declared provider (native and Starlark) for the specified constructor under the
* specified attribute of this target in the BUILD file. May return null if there is no
* TransitiveInfoCollection under the specified attribute.
*/
@@ -1110,7 +1110,7 @@
}
/**
- * Returns the declared provider (native and Skylark) for the specified constructor under the
+ * Returns the declared provider (native and Starlark) for the specified constructor under the
* specified attribute of this target in the BUILD file. May return null if there is no
* TransitiveInfoCollection under the specified attribute.
*/
@@ -1465,15 +1465,13 @@
function.getImplicitOutputs(
getAnalysisEnvironment().getEventHandler(), RawAttributeMapper.of(rule));
} catch (EvalException e) {
- // It's ok as long as we don't use this method from Skylark.
+ // It's ok as long as we don't use this method from Starlark.
throw new IllegalStateException(e);
}
return getImplicitOutputArtifact(Iterables.getOnlyElement(result), contentBasedPath);
}
- /**
- * Only use from Skylark. Returns the implicit output artifact for a given output path.
- */
+ /** Only use from Starlark. Returns the implicit output artifact for a given output path. */
public Artifact getImplicitOutputArtifact(String path) {
return getImplicitOutputArtifact(path, /*contentBasedPath=*/ false);
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupport.java b/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupport.java
index a576306..7d49ba8 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupport.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupport.java
@@ -164,7 +164,7 @@
this.args = args;
}
- /** Returns the executable owning this RunfilesSupport. Only use from Skylark. */
+ /** Returns the executable owning this RunfilesSupport. Only use from Starlark. */
public Artifact getExecutable() {
return owningExecutable;
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/SkylarkProviderValidationUtil.java b/src/main/java/com/google/devtools/build/lib/analysis/SkylarkProviderValidationUtil.java
index 43de251..913c7f4 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/SkylarkProviderValidationUtil.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/SkylarkProviderValidationUtil.java
@@ -19,9 +19,7 @@
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.syntax.EvalException;
-/**
- * Utility class to validate results of executing Skylark rules and aspects.
- */
+/** Utility class to validate results of executing Starlark rules and aspects. */
public class SkylarkProviderValidationUtil {
public static void validateArtifacts(RuleContext ruleContext) throws EvalException {
ImmutableSet<Artifact> treeArtifactsConflictingWithFiles =
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/TransitiveInfoProviderMap.java b/src/main/java/com/google/devtools/build/lib/analysis/TransitiveInfoProviderMap.java
index 41e4cf3..9474390 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/TransitiveInfoProviderMap.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/TransitiveInfoProviderMap.java
@@ -23,13 +23,13 @@
* <p>We have three kinds of provider identifiers:
*
* <ul>
- * <li>Declared providers. They are exposed to Skylark and identified by {@link
+ * <li>Declared providers. They are exposed to Starlark and identified by {@link
* com.google.devtools.build.lib.packages.Provider.Key}. Provider instances are {@link
* com.google.devtools.build.lib.packages.Info}s.
* <li>Native providers. They are identified by their {@link Class} and their instances are
* instances of that class. They should implement {@link TransitiveInfoProvider} marker
* interface.
- * <li>Legacy Skylark providers (deprecated). They are identified by simple strings, and their
+ * <li>Legacy Starlark providers (deprecated). They are identified by simple strings, and their
* instances are more-less random objects.
* </ul>
*/
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigAwareAspectBuilder.java b/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigAwareAspectBuilder.java
index 0b6bb2a..4570109 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigAwareAspectBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigAwareAspectBuilder.java
@@ -78,7 +78,7 @@
* to.
*
* <p>In contrast to {@link #requiresHostConfigurationFragments(Class...)}, this method takes
- * Skylark module names of fragments instead of their classes.
+ * Starlark module names of fragments instead of their classes.
*/
public ConfigAwareAspectBuilder requiresHostConfigurationFragmentsBySkylarkModuleName(
Collection<String> configurationFragmentNames) {
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigAwareRuleClassBuilder.java b/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigAwareRuleClassBuilder.java
index bfa5414..4353ab3 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigAwareRuleClassBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigAwareRuleClassBuilder.java
@@ -79,7 +79,7 @@
* to.
*
* <p>In contrast to {@link #requiresHostConfigurationFragments(Class...)}, this method takes
- * Skylark module names of fragments instead of their classes.
+ * Starlark module names of fragments instead of their classes.
*/
public ConfigAwareRuleClassBuilder requiresHostConfigurationFragmentsBySkylarkModuleName(
Collection<String> configurationFragmentNames) {
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/FragmentCollection.java b/src/main/java/com/google/devtools/build/lib/analysis/config/FragmentCollection.java
index 11f2ab7..c337f3a 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/FragmentCollection.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/FragmentCollection.java
@@ -22,7 +22,7 @@
import com.google.devtools.build.lib.syntax.EvalException;
import javax.annotation.Nullable;
-/** Represents a collection of configuration fragments in Skylark. */
+/** Represents a collection of configuration fragments in Starlark. */
// Documentation can be found at ctx.fragments
@Immutable
public class FragmentCollection implements FragmentCollectionApi {
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/AbstractConfiguredTarget.java b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/AbstractConfiguredTarget.java
index 6641fd0..2375b9c 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/AbstractConfiguredTarget.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/AbstractConfiguredTarget.java
@@ -57,7 +57,7 @@
// Cached on-demand default provider
private final AtomicReference<DefaultInfo> defaultProvider = new AtomicReference<>();
- // Accessors for Skylark
+ // Accessors for Starlark
private static final String DATA_RUNFILES_FIELD = "data_runfiles";
private static final String DEFAULT_RUNFILES_FIELD = "default_runfiles";
@@ -217,7 +217,7 @@
return defaultProvider.get();
}
- /** Returns a declared provider provided by this target. Only meant to use from Skylark. */
+ /** Returns a declared provider provided by this target. Only meant to use from Starlark. */
@Nullable
@Override
public final Info get(Provider.Key providerKey) {
@@ -227,7 +227,7 @@
return rawGetSkylarkProvider(providerKey);
}
- /** Implement in subclasses to get a skylark provider for a given {@code providerKey}. */
+ /** Implement in subclasses to get a Starlark provider for a given {@code providerKey}. */
@Nullable
protected abstract Info rawGetSkylarkProvider(Provider.Key providerKey);
@@ -235,9 +235,7 @@
return "";
}
- /**
- * Returns a value provided by this target. Only meant to use from Skylark.
- */
+ /** Returns a value provided by this target. Only meant to use from Starlark. */
@Override
public final Object get(String providerKey) {
switch (providerKey) {
@@ -256,7 +254,7 @@
}
}
- /** Implement in subclasses to get a skylark provider for a given {@code providerKey}. */
+ /** Implement in subclasses to get a Starlark provider for a given {@code providerKey}. */
protected abstract Object rawGetSkylarkProvider(String providerKey);
// All main target classes must override this method to provide more descriptive strings.
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/platform/ConstraintSettingInfo.java b/src/main/java/com/google/devtools/build/lib/analysis/platform/ConstraintSettingInfo.java
index 84abdb2..af6ae5b 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/platform/ConstraintSettingInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/platform/ConstraintSettingInfo.java
@@ -31,7 +31,7 @@
@Immutable
@AutoCodec
public class ConstraintSettingInfo extends NativeInfo implements ConstraintSettingInfoApi {
- /** Name used in Skylark for accessing this provider. */
+ /** Name used in Starlark for accessing this provider. */
public static final String SKYLARK_NAME = "ConstraintSettingInfo";
/** Provider singleton constant. */
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/platform/ConstraintValueInfo.java b/src/main/java/com/google/devtools/build/lib/analysis/platform/ConstraintValueInfo.java
index 3de40c9..ed3e80e 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/platform/ConstraintValueInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/platform/ConstraintValueInfo.java
@@ -30,7 +30,7 @@
@Immutable
@AutoCodec
public class ConstraintValueInfo extends NativeInfo implements ConstraintValueInfoApi {
- /** Name used in Skylark for accessing this provider. */
+ /** Name used in Starlark for accessing this provider. */
public static final String SKYLARK_NAME = "ConstraintValueInfo";
/** Provider singleton constant. */
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/platform/DeclaredToolchainInfo.java b/src/main/java/com/google/devtools/build/lib/analysis/platform/DeclaredToolchainInfo.java
index e067eba..1b0bc3d 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/platform/DeclaredToolchainInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/platform/DeclaredToolchainInfo.java
@@ -17,7 +17,6 @@
import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableList;
import com.google.devtools.build.lib.analysis.TransitiveInfoProvider;
-import com.google.devtools.build.lib.analysis.platform.ConstraintCollection.DuplicateConstraintException;
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization;
@@ -27,7 +26,7 @@
* Provider for a toolchain declaration, which associates a toolchain type, the execution and target
* constraints, and the actual toolchain label. The toolchain is then available for use but will be
* lazily resolved only when it is actually needed for toolchain-aware rules. Toolchain definitions
- * are exposed to Skylark and Bazel via {@link ToolchainInfo} providers.
+ * are exposed to Starlark and Bazel via {@link ToolchainInfo} providers.
*/
@AutoValue
@AutoCodec
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/platform/PlatformInfo.java b/src/main/java/com/google/devtools/build/lib/analysis/platform/PlatformInfo.java
index 73fe422..034d41b 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/platform/PlatformInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/platform/PlatformInfo.java
@@ -51,7 +51,7 @@
*/
public static final String PARENT_REMOTE_EXECUTION_KEY = "{PARENT_REMOTE_EXECUTION_PROPERTIES}";
- /** Name used in Skylark for accessing this provider. */
+ /** Name used in Starlark for accessing this provider. */
public static final String SKYLARK_NAME = "PlatformInfo";
/** Provider singleton constant. */
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/platform/ToolchainTypeInfo.java b/src/main/java/com/google/devtools/build/lib/analysis/platform/ToolchainTypeInfo.java
index 319e587..1b42978 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/platform/ToolchainTypeInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/platform/ToolchainTypeInfo.java
@@ -29,7 +29,7 @@
@Immutable
@AutoCodec
public class ToolchainTypeInfo extends NativeInfo implements ToolchainTypeInfoApi {
- /** Name used in Skylark for accessing this provider. */
+ /** Name used in Starlark for accessing this provider. */
public static final String SKYLARK_NAME = "ToolchainTypeInfo";
/** Provider singleton constant. */
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/BazelBuildApiGlobals.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/BazelBuildApiGlobals.java
index 415a08b..7217fe5 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/BazelBuildApiGlobals.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/BazelBuildApiGlobals.java
@@ -21,8 +21,8 @@
import com.google.devtools.build.lib.syntax.StarlarkThread;
/**
- * Bazel implementation of {@link SkylarkBuildApiGlobals}: a collection of global skylark build
- * API functions that belong in the global namespace.
+ * Bazel implementation of {@link SkylarkBuildApiGlobals}: a collection of global Starlark build API
+ * functions that belong in the global namespace.
*/
public class BazelBuildApiGlobals implements SkylarkBuildApiGlobals {
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/FunctionTransitionUtil.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/FunctionTransitionUtil.java
index d73f26f..3f46c49 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/FunctionTransitionUtil.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/FunctionTransitionUtil.java
@@ -153,13 +153,13 @@
}
/**
- * Enter the options in buildOptions into a skylark dictionary, and return the dictionary.
+ * Enter the options in buildOptions into a Starlark dictionary, and return the dictionary.
*
* @throws IllegalArgumentException If the method is unable to look up the value in buildOptions
* corresponding to an entry in optionInfoMap
* @throws RuntimeException If the field corresponding to an option value in buildOptions is
* inaccessible due to Java language access control, or if an option name is an invalid key to
- * the Skylark dictionary
+ * the Starlark dictionary
* @throws EvalException if any of the specified transition inputs do not correspond to a valid
* build setting
*/
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkActionFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkActionFactory.java
index 0382952..3b1d5db 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkActionFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkActionFactory.java
@@ -68,7 +68,7 @@
import java.util.Optional;
import java.util.UUID;
-/** Provides a Skylark interface for all action creation needs. */
+/** Provides a Starlark interface for all action creation needs. */
public class SkylarkActionFactory implements SkylarkActionFactoryApi {
private final SkylarkRuleContext context;
private final StarlarkSemantics starlarkSemantics;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkApiProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkApiProvider.java
index d47aff9..6573000 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkApiProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkApiProvider.java
@@ -18,8 +18,8 @@
import com.google.devtools.build.lib.analysis.ProviderCollection;
/**
- * An abstract class for adding a Skylark API for the native providers. Derived classes should
- * declare functions to be used from Skylark.
+ * An abstract class for adding a Starlark API for the native providers. Derived classes should
+ * declare functions to be used from Starlark.
*/
public abstract class SkylarkApiProvider {
private ProviderCollection info;
@@ -33,7 +33,7 @@
// todo(dslomov): nuke this weird initialization mechanism.
// Allow multiple calls.
- // It is possible for the Skylark rule to get a SkylarkApiProvider such as `target.java`
+ // It is possible for the Starlark rule to get a SkylarkApiProvider such as `target.java`
// from its dependency and pass it on. It does not make a whole lot of sense, but we
// shouldn't crash.
return;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkAttr.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkAttr.java
index e895d07..38609a3 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkAttr.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkAttr.java
@@ -60,10 +60,10 @@
import javax.annotation.Nullable;
/**
- * A helper class to provide Attr module in Skylark.
+ * A helper class to provide Attr module in Starlark.
*
- * <p>It exposes functions (for example, 'attr.string', 'attr.label_list', etc.) to Skylark users.
- * The functions are executed through reflection. As everywhere in Skylark, arguments are
+ * <p>It exposes functions (for example, 'attr.string', 'attr.label_list', etc.) to Starlark users.
+ * The functions are executed through reflection. As everywhere in Starlark, arguments are
* type-checked with the signature and cannot be null.
*/
public final class SkylarkAttr implements SkylarkAttrApi {
@@ -95,7 +95,7 @@
Type<?> type, String doc, Map<String, Object> arguments, StarlarkThread thread)
throws EvalException {
// We use an empty name now so that we can set it later.
- // This trick makes sense only in the context of Skylark (builtin rules should not use it).
+ // This trick makes sense only in the context of Starlark (builtin rules should not use it).
return createAttributeFactory(type, doc, arguments, thread, "");
}
@@ -296,7 +296,7 @@
}
/**
- * Builds a list of sets of accepted providers from Skylark list {@code obj}. The list can either
+ * Builds a list of sets of accepted providers from Starlark list {@code obj}. The list can either
* be a list of providers (in that case the result is a list with one set) or a list of lists of
* providers (then the result is the list of sets).
*
@@ -322,15 +322,15 @@
}
/**
- * Returns true if {@code o} is a Skylark provider (either a declared provider or
- * a legacy provider name.
+ * Returns true if {@code o} is a Starlark provider (either a declared provider or a legacy
+ * provider name.
*/
static boolean isProvider(Object o) {
return o instanceof String || o instanceof Provider;
}
/**
- * Converts Skylark identifiers of providers (either a string or a provider value) to their
+ * Converts Starlark identifiers of providers (either a string or a provider value) to their
* internal representations.
*/
static ImmutableSet<SkylarkProviderIdentifier> getSkylarkProviderIdentifiers(Sequence<?> list)
@@ -418,7 +418,7 @@
Preconditions.checkNotNull(maybeGetNonConfigurableReason(type), type);
try {
// We use an empty name now so that we can set it later.
- // This trick makes sense only in the context of Skylark (builtin rules should not use it).
+ // This trick makes sense only in the context of Starlark (builtin rules should not use it).
return new Descriptor(
name,
createAttribute(type, null, kwargs, thread, "")
@@ -775,7 +775,7 @@
thread);
}
- /** A descriptor of an attribute defined in Skylark. */
+ /** A descriptor of an attribute defined in Starlark. */
@AutoCodec
public static final class Descriptor implements SkylarkAttrApi.Descriptor {
private final ImmutableAttributeFactory attributeFactory;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkAttributesCollection.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkAttributesCollection.java
index 3aeeff8..59f22e8 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkAttributesCollection.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkAttributesCollection.java
@@ -162,14 +162,14 @@
// TODO(b/140636597): Remove the LABEL_DICT_UNARY special case of this conditional
// LABEL_DICT_UNARY was previously not treated as a dependency-bearing type, and was put into
- // Skylark as a Map<String, Label>; this special case preserves that behavior temporarily.
+ // Starlark as a Map<String, Label>; this special case preserves that behavior temporarily.
if (type.getLabelClass() != LabelClass.DEPENDENCY || type == BuildType.LABEL_DICT_UNARY) {
// Attribute values should be type safe
attrBuilder.put(skyname, Starlark.fromJava(val, null));
return;
}
if (a.isExecutable()) {
- // In Skylark only label (not label list) type attributes can have the Executable flag.
+ // In Starlark only label (not label list) type attributes can have the Executable flag.
FilesToRunProvider provider =
context
.getRuleContext()
@@ -192,7 +192,7 @@
}
}
if (a.isSingleArtifact()) {
- // In Skylark only label (not label list) type attributes can have the SingleArtifact flag.
+ // In Starlark only label (not label list) type attributes can have the SingleArtifact flag.
Artifact artifact =
context
.getRuleContext()
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkCommandLine.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkCommandLine.java
index ffc11be..4fb657f 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkCommandLine.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkCommandLine.java
@@ -20,7 +20,7 @@
import com.google.devtools.build.lib.syntax.Depset;
import com.google.devtools.build.lib.syntax.EvalException;
-/** A Skylark module class to create memory efficient command lines. */
+/** A Starlark module class to create memory efficient command lines. */
public class SkylarkCommandLine implements SkylarkCommandLineApi {
@Override
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkCustomCommandLine.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkCustomCommandLine.java
index b8222b9..17f5e72 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkCustomCommandLine.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkCustomCommandLine.java
@@ -54,7 +54,7 @@
import java.util.function.Consumer;
import javax.annotation.Nullable;
-/** Supports ctx.actions.args() from Skylark. */
+/** Supports ctx.actions.args() from Starlark. */
@AutoCodec
public class SkylarkCustomCommandLine extends CommandLine {
private final StarlarkSemantics starlarkSemantics;
@@ -897,7 +897,7 @@
@Override
public int maxInstancesAllowed() {
- // No limit to these, as this is just a wrapper for Skylark functions, which are
+ // No limit to these, as this is just a wrapper for Starlark functions, which are
// always static
return Integer.MAX_VALUE;
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkErrorReporter.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkErrorReporter.java
index 6200946..6f66680 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkErrorReporter.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkErrorReporter.java
@@ -18,7 +18,7 @@
import com.google.devtools.build.lib.syntax.EvalException;
/**
- * {@link RuleErrorConsumer} for Native implementations of Skylark APIs.
+ * {@link RuleErrorConsumer} for Native implementations of Starlark APIs.
*
* <p>This class proxies reported errors and warnings to a proxy {@link RuleErrorConsumer}, except
* that it suppresses all cases of actually throwing exceptions until this reporter is closed.
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkLateBoundDefault.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkLateBoundDefault.java
index bbffd24..110f7db 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkLateBoundDefault.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkLateBoundDefault.java
@@ -38,7 +38,7 @@
/**
* An implementation of {@link LateBoundDefault} which obtains a late-bound attribute value (of type
- * 'label') specifically by skylark configuration fragment name and field name, as registered by
+ * 'label') specifically by Starlark configuration fragment name and field name, as registered by
* {@link SkylarkConfigurationField}.
*
* <p>For example, a SkylarkLateBoundDefault on "java" and "toolchain" would require a valid
@@ -106,15 +106,15 @@
}
/**
- * Returns the skylark name of the configuration fragment that this late bound default requires.
+ * Returns the Starlark name of the configuration fragment that this late bound default requires.
*/
public String getFragmentName() {
return fragmentName;
}
/**
- * Returns the skylark name of the configuration field name, as registered by
- * {@link SkylarkConfigurationField} annotation on the configuration fragment.
+ * Returns the Starlark name of the configuration field name, as registered by {@link
+ * SkylarkConfigurationField} annotation on the configuration fragment.
*/
public String getFragmentFieldName() {
return fragmentFieldName;
@@ -177,7 +177,7 @@
/**
* A cache for efficient {@link SkylarkLateBoundDefault} loading by configuration fragment. Each
* configuration fragment class key is mapped to a {@link Map} where keys are configuration field
- * skylark names, and values are the {@link SkylarkLateBoundDefault}s. Methods must be annotated
+ * Starlark names, and values are the {@link SkylarkLateBoundDefault}s. Methods must be annotated
* with {@link SkylarkConfigurationField} to be considered.
*/
private static final LoadingCache<CacheKey, Map<String, SkylarkLateBoundDefault<?>>> fieldCache =
@@ -224,10 +224,10 @@
/**
* Returns a {@link LateBoundDefault} which obtains a late-bound attribute value (of type 'label')
- * specifically by skylark configuration fragment name and field name, as registered by {@link
+ * specifically by Starlark configuration fragment name and field name, as registered by {@link
* SkylarkConfigurationField}.
*
- * @param fragmentClass the configuration fragment class, which must have a valid skylark name
+ * @param fragmentClass the configuration fragment class, which must have a valid Starlark name
* @param fragmentFieldName the configuration field name, as registered by {@link
* SkylarkConfigurationField} annotation
* @param toolsRepository the Bazel tools repository path fragment
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkModules.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkModules.java
index b6b72d6..6d3d29f 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkModules.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkModules.java
@@ -24,9 +24,7 @@
import com.google.devtools.build.lib.skylarkbuildapi.TopLevelBootstrap;
import com.google.devtools.build.lib.syntax.Starlark;
-/**
- * The basis for a Skylark Environment with all build-related modules registered.
- */
+/** The basis for a Starlark Environment with all build-related modules registered. */
public final class SkylarkModules {
private SkylarkModules() { }
@@ -45,7 +43,7 @@
DefaultInfo.PROVIDER);
/**
- * Adds bindings for skylark built-ins and non-rules-specific globals of the build API to the
+ * Adds bindings for Starlark built-ins and non-rules-specific globals of the build API to the
* given environment map builder.
*/
public static void addSkylarkGlobalsToBuilder(ImmutableMap.Builder<String, Object> env) {
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java
index a8a0acd..3c521e3 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java
@@ -100,12 +100,12 @@
import java.util.Map;
import java.util.concurrent.ExecutionException;
-/** A helper class to provide an easier API for Skylark rule definitions. */
+/** A helper class to provide an easier API for Starlark rule definitions. */
public class SkylarkRuleClassFunctions implements SkylarkRuleFunctionsApi<Artifact> {
// TODO(bazel-team): Copied from ConfiguredRuleClassProvider for the transition from built-in
- // rules to skylark extensions. Using the same instance would require a large refactoring.
- // If we don't want to support old built-in rules and Skylark simultaneously
+ // rules to Starlark extensions. Using the same instance would require a large refactoring.
+ // If we don't want to support old built-in rules and Starlark simultaneously
// (except for transition phase) it's probably OK.
private static final LoadingCache<String, Label> labelCache =
CacheBuilder.newBuilder()
@@ -125,13 +125,13 @@
});
// TODO(bazel-team): Remove the code duplication (BaseRuleClasses and this class).
- /** Parent rule class for non-executable non-test Skylark rules. */
+ /** Parent rule class for non-executable non-test Starlark rules. */
public static final RuleClass baseRule =
BaseRuleClasses.commonCoreAndSkylarkAttributes(
BaseRuleClasses.nameAttribute(
new RuleClass.Builder("$base_rule", RuleClassType.ABSTRACT, true))
.add(attr("expect_failure", STRING)))
- // TODO(skylark-team): Allow Skylark rules to extend native rules and remove duplication.
+ // TODO(skylark-team): Allow Starlark rules to extend native rules and remove duplication.
.add(
attr("toolchains", LABEL_LIST)
.allowedFileTypes(FileTypeSet.NO_FILE)
@@ -145,14 +145,14 @@
.value(ImmutableList.of()))
.build();
- /** Parent rule class for executable non-test Skylark rules. */
+ /** Parent rule class for executable non-test Starlark rules. */
public static final RuleClass binaryBaseRule =
new RuleClass.Builder("$binary_base_rule", RuleClassType.ABSTRACT, true, baseRule)
.add(attr("args", STRING_LIST))
.add(attr("output_licenses", LICENSE))
.build();
- /** Parent rule class for test Skylark rules. */
+ /** Parent rule class for test Starlark rules. */
public static final RuleClass getTestBaseRule(RuleDefinitionContext env) {
String toolsRepository = env.getToolsRepository();
return new RuleClass.Builder("$test_base_rule", RuleClassType.ABSTRACT, true, baseRule)
@@ -583,7 +583,7 @@
}
/**
- * The implementation for the magic function "rule" that creates Skylark rule classes.
+ * The implementation for the magic function "rule" that creates Starlark rule classes.
*
* <p>Exactly one of {@link #builder} or {@link #ruleClass} is null except inside {@link #export}.
*/
@@ -645,7 +645,7 @@
}
for (Attribute attribute : ruleClass.getAttributes()) {
- // TODO(dslomov): If a Skylark parameter extractor is specified for this aspect, its
+ // TODO(dslomov): If a Starlark parameter extractor is specified for this aspect, its
// attributes may not be required.
for (Map.Entry<String, ImmutableSet<String>> attrRequirements :
attribute.getRequiredAspectParameters().entrySet()) {
@@ -682,7 +682,7 @@
return Starlark.NONE;
}
- /** Export a RuleFunction from a Skylark file with a given name. */
+ /** Export a RuleFunction from a Starlark file with a given name. */
public void export(Label skylarkLabel, String ruleClassName) throws EvalException {
Preconditions.checkState(ruleClass == null && builder != null);
this.skylarkLabel = skylarkLabel;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleConfiguredTargetUtil.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleConfiguredTargetUtil.java
index a1433cb..a85cec9 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleConfiguredTargetUtil.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleConfiguredTargetUtil.java
@@ -73,7 +73,7 @@
/**
* A helper class to build Rule Configured Targets via runtime loaded rule implementations defined
- * using the Skylark Build Extension Language.
+ * using the Starlark Build Extension Language.
*/
public final class SkylarkRuleConfiguredTargetUtil {
@@ -652,7 +652,7 @@
? RunfilesProvider.simple(mergeFiles(statelessRunfiles, executable, ruleContext))
: RunfilesProvider.withData(
// The executable doesn't get into the default runfiles if we have runfiles states.
- // This is to keep skylark genrule consistent with the original genrule.
+ // This is to keep Starlark genrule consistent with the original genrule.
defaultRunfiles != null ? defaultRunfiles : Runfiles.EMPTY,
dataRunfiles != null ? dataRunfiles : Runfiles.EMPTY);
builder.addProvider(RunfilesProvider.class, runfilesProvider);
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleContext.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleContext.java
index 4cee2f9..0d05107 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleContext.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleContext.java
@@ -102,7 +102,7 @@
import javax.annotation.Nullable;
/**
- * A Skylark API for the ruleContext.
+ * A Starlark API for the ruleContext.
*
* <p>"This object becomes featureless once the rule implementation function that it was created for
* has completed. To achieve this, the {@link #nullify()} should be called once the evaluation of
@@ -451,7 +451,7 @@
// If the split transition is not in effect, then the key will be missing since there's
// nothing to key on because the dependencies aren't split and getSplitPrerequisites()
// behaves like getPrerequisites(). This also means there should be only one entry in
- // the map. Use None in Skylark to represent this.
+ // the map. Use None in Starlark to represent this.
Preconditions.checkState(splitPrereqs.size() == 1);
splitPrereqsMap.put(Starlark.NONE, value);
}
@@ -866,7 +866,7 @@
}
/**
- * A Skylark built-in function to create and register a SpawnAction using a dictionary of
+ * A Starlark built-in function to create and register a SpawnAction using a dictionary of
* parameters: action( inputs = [input1, input2, ...], outputs = [output1, output2, ...],
* executable = executable, arguments = [argument1, argument2, ...], mnemonic = 'Mnemonic',
* command = 'command', )
@@ -1004,7 +1004,7 @@
((Depset) transitiveFiles).getSetFromParam(Artifact.class, "transitive_files"));
}
if (!symlinks.isEmpty()) {
- // If Skylark code directly manipulates symlinks, activate more stringent validity checking.
+ // If Starlark code directly manipulates symlinks, activate more stringent validity checking.
checkConflicts = true;
for (Map.Entry<String, Artifact> entry :
symlinks.getContents(String.class, Artifact.class, "symlinks").entrySet()) {
@@ -1039,7 +1039,7 @@
checkMutable("resolve_command");
Label ruleLabel = getLabel();
Map<Label, Iterable<Artifact>> labelDict = checkLabelDict(labelDictUnchecked);
- // The best way to fix this probably is to convert CommandHelper to Skylark.
+ // The best way to fix this probably is to convert CommandHelper to Starlark.
CommandHelper helper =
CommandHelper.builder(getRuleContext())
.addToolDependencies(tools.getContents(TransitiveInfoCollection.class, "tools"))
@@ -1058,7 +1058,7 @@
List<Artifact> inputs = new ArrayList<>();
// TODO(lberki): This flattens a NestedSet.
// However, we can't turn this into a Depset because it's an incompatible change to
- // Skylark.
+ // Starlark.
inputs.addAll(helper.getResolvedTools().toList());
ImmutableMap<String, String> executionRequirements =
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/annotations/processor/BUILD b/src/main/java/com/google/devtools/build/lib/analysis/skylark/annotations/processor/BUILD
index 8b93354..7236181 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/annotations/processor/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/annotations/processor/BUILD
@@ -1,7 +1,7 @@
load("@rules_java//java:defs.bzl", "java_plugin")
# Description:
-# A preprocessor for skylark annotations.
+# A preprocessor for Starlark annotations.
package(default_visibility = ["//src:__subpackages__"])
filegroup(
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/test/ExecutionInfo.java b/src/main/java/com/google/devtools/build/lib/analysis/test/ExecutionInfo.java
index f8aa3b4..163e72a 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/test/ExecutionInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/test/ExecutionInfo.java
@@ -27,7 +27,7 @@
@Immutable
public final class ExecutionInfo extends NativeInfo implements ExecutionInfoApi {
- /** Skylark constructor and identifier for ExecutionInfo. */
+ /** Starlark constructor and identifier for ExecutionInfo. */
public static final NativeProvider<ExecutionInfo> PROVIDER =
new NativeProvider<ExecutionInfo>(ExecutionInfo.class, "ExecutionInfo") {};
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/commands/SyncCommand.java b/src/main/java/com/google/devtools/build/lib/bazel/commands/SyncCommand.java
index 7b7dc23..840a491 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/commands/SyncCommand.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/commands/SyncCommand.java
@@ -171,7 +171,7 @@
fileValue.getPackage().getRegisteredExecutionPlatforms()));
env.getReporter().post(new RepositoryOrderEvent(repositoryOrder.build()));
- // take all skylark workspace rules and get their values
+ // take all Starlark workspace rules and get their values
ImmutableSet.Builder<SkyKey> repositoriesToFetch = new ImmutableSet.Builder<>();
for (Rule rule : fileValue.getPackage().getTargets(Rule.class)) {
if (rule.getRuleClass().equals("bind")) {
@@ -236,7 +236,7 @@
return SkylarkRepositoryFunction.isConfigureRule(rule);
}
if (rule.getRuleClassObject().isSkylark()) {
- // Skylark rules are all whitelisted
+ // Starlark rules are all whitelisted
return true;
}
return WHITELISTED_NATIVE_RULES.contains(rule.getRuleClassObject().getName());
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/commands/sync.txt b/src/main/java/com/google/devtools/build/lib/bazel/commands/sync.txt
index 0e651c5..242203f 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/commands/sync.txt
+++ b/src/main/java/com/google/devtools/build/lib/bazel/commands/sync.txt
@@ -1,7 +1,7 @@
Usage: %{product} %{command} [<option> ...]
-Ensures that all Skylark repository rules of the top-level WORKSPACE
+Ensures that all Starlark repository rules of the top-level WORKSPACE
file are called.
NOTE: This command is still very experimental and the precise semantics
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/RepositoryResolvedOptions.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/RepositoryResolvedOptions.java
index a42c5e0..1d47e4f 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/repository/RepositoryResolvedOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/RepositoryResolvedOptions.java
@@ -28,7 +28,7 @@
documentationCategory = OptionDocumentationCategory.LOGGING,
effectTags = {OptionEffectTag.AFFECTS_OUTPUTS},
help =
- "If non-empty, write a Skylark value with the resolved information of all Starlark"
+ "If non-empty, write a Starlark value with the resolved information of all Starlark"
+ " repository rules that were executed.")
public String repositoryResolvedFile;
}
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkExecutionResult.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkExecutionResult.java
index f4d457f..655d50c 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkExecutionResult.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkExecutionResult.java
@@ -37,7 +37,7 @@
import java.util.Map;
/**
- * A structure callable from Skylark that stores the result of repository_ctx.execute() method. It
+ * A structure callable from Starlark that stores the result of repository_ctx.execute() method. It
* contains the standard output stream content, the standard error stream content and the execution
* return code.
*/
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkOS.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkOS.java
index b2d3c18..0a297f8 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkOS.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkOS.java
@@ -20,7 +20,7 @@
import java.util.Map;
-/** A Skylark structure to deliver information about the system we are running on. */
+/** A Starlark structure to deliver information about the system we are running on. */
@Immutable
final class SkylarkOS implements SkylarkOSApi {
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkPath.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkPath.java
index 67c33a7..f192754 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkPath.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkPath.java
@@ -22,9 +22,9 @@
import java.io.IOException;
/**
- * A Path object to be used into Skylark remote repository.
+ * A Path object to be used into Starlark remote repository.
*
- * <p>This path object enable non-hermetic operations from Skylark and should not be returned by
+ * <p>This path object enable non-hermetic operations from Starlark and should not be returned by
* something other than a SkylarkRepositoryContext.
*/
@Immutable
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryContext.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryContext.java
index b0e878a..9b35a71 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryContext.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryContext.java
@@ -90,7 +90,7 @@
import java.util.Map;
import javax.annotation.Nullable;
-/** Skylark API for the repository_rule's context. */
+/** Starlark API for the repository_rule's context. */
public class SkylarkRepositoryContext
implements SkylarkRepositoryContextApi<RepositoryFunctionException> {
private static final ImmutableList<String> WHITELISTED_REPOS_FOR_FLAG_ENABLED =
@@ -115,7 +115,7 @@
private final RepositoryRemoteExecutor remoteExecutor;
/**
- * Create a new context (repository_ctx) object for a skylark repository rule ({@code rule}
+ * Create a new context (repository_ctx) object for a Starlark repository rule ({@code rule}
* argument).
*/
SkylarkRepositoryContext(
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryFunction.java
index 732055d..28dab78 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryFunction.java
@@ -51,9 +51,7 @@
import java.util.Set;
import javax.annotation.Nullable;
-/**
- * A repository function to delegate work done by skylark remote repositories.
- */
+/** A repository function to delegate work done by Starlark remote repositories. */
public class SkylarkRepositoryFunction extends RepositoryFunction {
static final String SEMANTICS = "STARLARK_SEMANTICS";
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryModule.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryModule.java
index ff4cc57..79e9c4d 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryModule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryModule.java
@@ -52,8 +52,8 @@
import java.util.Map;
/**
- * The Skylark module containing the definition of {@code repository_rule} function to define a
- * skylark remote repository.
+ * The Starlark module containing the definition of {@code repository_rule} function to define a
+ * Starlark remote repository.
*/
public class SkylarkRepositoryModule implements RepositoryModuleApi {
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRulesModule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRulesModule.java
index 4ce93ce..721f7fa 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRulesModule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRulesModule.java
@@ -288,7 +288,7 @@
OptionMetadataTag.DEPRECATED
},
help =
- "Flag for disabling the legacy cc_toolchain Skylark API for accessing legacy "
+ "Flag for disabling the legacy cc_toolchain Starlark API for accessing legacy "
+ "CROSSTOOL fields.")
public boolean disableLegacyFlagsCcToolchainApi;
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r10e/AndroidNdkCrosstoolsR10e.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r10e/AndroidNdkCrosstoolsR10e.java
index 7fcaad2..7a7f4b8 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r10e/AndroidNdkCrosstoolsR10e.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r10e/AndroidNdkCrosstoolsR10e.java
@@ -33,7 +33,7 @@
* release revision. The crosstools are generated through code rather than checked in as a flat
* file to reduce the amount of templating needed (for parameters like the release name and
* certain paths), to reduce duplication, and to make it easier to support future versions of the
- * NDK. TODO(bazel-team): Eventually we should move this into Skylark so the crosstools can be
+ * NDK. TODO(bazel-team): Eventually we should move this into Starlark so the crosstools can be
* updated independently of Bazel itself.
*
* @return A CrosstoolRelease for the Android NDK.
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r11/AndroidNdkCrosstoolsR11.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r11/AndroidNdkCrosstoolsR11.java
index c9643b6..f98d141 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r11/AndroidNdkCrosstoolsR11.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r11/AndroidNdkCrosstoolsR11.java
@@ -36,7 +36,7 @@
* release revision. The crosstools are generated through code rather than checked in as a flat
* file to reduce the amount of templating needed (for parameters like the release name and
* certain paths), to reduce duplication, and to make it easier to support future versions of the
- * NDK. TODO(bazel-team): Eventually we should move this into Skylark so the crosstools can be
+ * NDK. TODO(bazel-team): Eventually we should move this into Starlark so the crosstools can be
* updated independently of Bazel itself.
*
* @return A CrosstoolRelease for the Android NDK.
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r12/AndroidNdkCrosstoolsR12.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r12/AndroidNdkCrosstoolsR12.java
index 25ab9c9..3c31bc7 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r12/AndroidNdkCrosstoolsR12.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r12/AndroidNdkCrosstoolsR12.java
@@ -33,7 +33,7 @@
* release revision. The crosstools are generated through code rather than checked in as a flat
* file to reduce the amount of templating needed (for parameters like the release name and
* certain paths), to reduce duplication, and to make it easier to support future versions of the
- * NDK. TODO(bazel-team): Eventually we should move this into Skylark so the crosstools can be
+ * NDK. TODO(bazel-team): Eventually we should move this into Starlark so the crosstools can be
* updated independently of Bazel itself.
*
* @return A CrosstoolRelease for the Android NDK.
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r13/AndroidNdkCrosstoolsR13.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r13/AndroidNdkCrosstoolsR13.java
index 3ee5b71..4538c11 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r13/AndroidNdkCrosstoolsR13.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r13/AndroidNdkCrosstoolsR13.java
@@ -30,7 +30,7 @@
* release revision. The crosstools are generated through code rather than checked in as a flat
* file to reduce the amount of templating needed (for parameters like the release name and
* certain paths), to reduce duplication, and to make it easier to support future versions of the
- * NDK. TODO(bazel-team): Eventually we should move this into Skylark so the crosstools can be
+ * NDK. TODO(bazel-team): Eventually we should move this into Starlark so the crosstools can be
* updated independently of Bazel itself.
*
* @return A CrosstoolRelease for the Android NDK.
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r19/AndroidNdkCrosstoolsR19.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r19/AndroidNdkCrosstoolsR19.java
index a4b4b7e..a653213 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r19/AndroidNdkCrosstoolsR19.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r19/AndroidNdkCrosstoolsR19.java
@@ -30,7 +30,7 @@
* release revision. The crosstools are generated through code rather than checked in as a flat
* file to reduce the amount of templating needed (for parameters like the release name and
* certain paths), to reduce duplication, and to make it easier to support future versions of the
- * NDK. TODO(bazel-team): Eventually we should move this into Skylark so the crosstools can be
+ * NDK. TODO(bazel-team): Eventually we should move this into Starlark so the crosstools can be
* updated independently of Bazel itself.
*
* @return A CrosstoolRelease for the Android NDK.
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCcModule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCcModule.java
index 7f8c23d..ea93db3 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCcModule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCcModule.java
@@ -39,7 +39,7 @@
import com.google.devtools.build.lib.syntax.Tuple;
/**
- * A module that contains Skylark utilities for C++ support.
+ * A module that contains Starlark utilities for C++ support.
*
* <p>This is a work in progress. The API is guarded behind
* --experimental_cc_skylark_api_enabled_packages. The API is under development and unstable.
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/genrule/BazelGenRuleRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/genrule/BazelGenRuleRule.java
index 7e8c045..cdda8a1 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/genrule/BazelGenRuleRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/genrule/BazelGenRuleRule.java
@@ -153,9 +153,9 @@
<li>Do use <code>$(location)</code> extensively, for outputs, tools and sources. Due to the
segregation of output files for different configurations, genrules cannot rely on hard-coded
and/or absolute paths.</li>
- <li>Do write a common Skylark macro in case the same or very similar genrules are used in multiple
- places. If the genrule is complex, consider implementing it in a script or as a Skylark rule.
- This improves readability as well as testability.</li>
+ <li>Do write a common Starlark macro in case the same or very similar genrules are used in
+ multiple places. If the genrule is complex, consider implementing it in a script or as a
+ Starlark rule. This improves readability as well as testability.</li>
<li>Do make sure that the exit code correctly indicates success or failure of the genrule.</li>
<li>Do not write informational messages to stdout or stderr. While useful for debugging, this can
easily become noise; a successful genrule should be silent. On the other hand, a failing genrule
diff --git a/src/main/java/com/google/devtools/build/lib/collect/nestedset/Order.java b/src/main/java/com/google/devtools/build/lib/collect/nestedset/Order.java
index 967dd5e..078238a 100644
--- a/src/main/java/com/google/devtools/build/lib/collect/nestedset/Order.java
+++ b/src/main/java/com/google/devtools/build/lib/collect/nestedset/Order.java
@@ -22,9 +22,9 @@
* Type of a nested set (defines order).
*
* <p>STABLE_ORDER: an unspecified traversal order. Use when the order of elements does not matter.
- * In Skylark it is called "default"; its older deprecated name is "stable".
+ * In Starlark it is called "default"; its older deprecated name is "stable".
*
- * <p>COMPILE_ORDER: left-to-right postorder. In Skylark it is called "postorder"; its older
+ * <p>COMPILE_ORDER: left-to-right postorder. In Starlark it is called "postorder"; its older
* deprecated name is "compile".
*
* <p>For example, for the nested set {B, D, {A, C}}, the iteration order is "A C B D"
@@ -34,7 +34,7 @@
* the direct members of a set, for example in the case of Javascript dependencies.
*
* <p>LINK_ORDER: a variation of left-to-right preorder that enforces topological sorting. In
- * Skylark it is called "topological"; its older deprecated name is "link".
+ * Starlark it is called "topological"; its older deprecated name is "link".
*
* <p>For example, for the nested set {A, C, {B, D}}, the iteration order is "A C B D"
* (parent-first).
@@ -85,7 +85,7 @@
* such cases ordering is decided by the rightmost branch because of the list reversing behind the
* scenes, so the ordering in the final enumeration will be "E D".
*
- * <p>NAIVE_LINK_ORDER: a left-to-right preordering. In Skylark it is called "preorder"; its older
+ * <p>NAIVE_LINK_ORDER: a left-to-right preordering. In Starlark it is called "preorder"; its older
* deprecated name is "naive_link".
*
* <p>For example, for the nested set {B, D, {A, C}}, the iteration order is "B D A C".
diff --git a/src/main/java/com/google/devtools/build/lib/packages/BuildType.java b/src/main/java/com/google/devtools/build/lib/packages/BuildType.java
index 3df8bfe..7b7073f 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/BuildType.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/BuildType.java
@@ -42,9 +42,7 @@
import java.util.Set;
import javax.annotation.Nullable;
-/**
- * Collection of data types that are specific to building things, i.e. not inherent to Skylark.
- */
+/** Collection of data types that are specific to building things, i.e. not inherent to Starlark. */
public final class BuildType {
/**
diff --git a/src/main/java/com/google/devtools/build/lib/packages/BuiltinProvider.java b/src/main/java/com/google/devtools/build/lib/packages/BuiltinProvider.java
index d4d5e8a..4a96dad 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/BuiltinProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/BuiltinProvider.java
@@ -93,7 +93,7 @@
/**
* Convenience method for subclasses of this class to throw a consistent error when a provider is
- * unable to be constructed from skylark.
+ * unable to be constructed from Starlark.
*/
protected final T throwUnsupportedConstructorException() throws EvalException {
throw Starlark.errorf("'%s' cannot be constructed from Starlark", getPrintableName());
diff --git a/src/main/java/com/google/devtools/build/lib/packages/SkylarkAspectClass.java b/src/main/java/com/google/devtools/build/lib/packages/SkylarkAspectClass.java
index 810280b..74be5c1 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/SkylarkAspectClass.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/SkylarkAspectClass.java
@@ -19,7 +19,7 @@
import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
import java.util.Objects;
-/** {@link AspectClass} for aspects defined in Skylark. */
+/** {@link AspectClass} for aspects defined in Starlark. */
@AutoCodec
@Immutable
public final class SkylarkAspectClass implements AspectClass {
diff --git a/src/main/java/com/google/devtools/build/lib/packages/SkylarkNativeModule.java b/src/main/java/com/google/devtools/build/lib/packages/SkylarkNativeModule.java
index 114f1c2..2d8d8ba 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/SkylarkNativeModule.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/SkylarkNativeModule.java
@@ -141,7 +141,7 @@
/*
If necessary, we could allow filtering by tag (anytag, alltags), name (regexp?), kind ?
- For now, we ignore this, since users can implement it in Skylark.
+ For now, we ignore this, since users can implement it in Starlark.
*/
@Override
public Dict<String, Dict<String, Object>> existingRules(StarlarkThread thread)
@@ -289,7 +289,7 @@
if (attr.getName().equals("distribs")) {
// attribute distribs: cannot represent type class java.util.Collections$SingletonSet
- // in Skylark: [INTERNAL].
+ // in Starlark: [INTERNAL].
continue;
}
@@ -408,7 +408,8 @@
// native.rules() fails if there is any rule using a select() in the BUILD file.
//
// To remedy this, we should return a SelectorList. To do so, we have to
- // 1) recurse into the Selector contents of SelectorList, so those values are skylarkified too
+ // 1) recurse into the Selector contents of SelectorList, so those values are Starlarkified
+ // too
// 2) get the right Class<?> value. We could probably get at that by looking at
// ((SelectorList)val).getSelectors().first().getEntries().first().getClass().
diff --git a/src/main/java/com/google/devtools/build/lib/packages/Target.java b/src/main/java/com/google/devtools/build/lib/packages/Target.java
index d6fe9c9..877ef06 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/Target.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/Target.java
@@ -21,9 +21,9 @@
import javax.annotation.Nullable;
/**
- * A node in the build dependency graph, identified by a Label.
+ * A node in the build dependency graph, identified by a Label.
*
- * This SkylarkModule does not contain any documentation since Skylark's Target type refers to
+ * <p>This SkylarkModule does not contain any documentation since Starlark's Target type refers to
* TransitiveInfoCollection.class, which contains the appropriate documentation.
*/
public interface Target extends TargetApi {
diff --git a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java
index c4c79a5..b4c8927 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java
@@ -80,7 +80,7 @@
/**
* @param builder a builder for the Workspace
* @param ruleClassProvider a provider for known rule classes
- * @param environmentExtensions the Skylark environment extensions
+ * @param environmentExtensions the Starlark environment extensions
* @param mutability the Mutability for the current evaluation context
* @param installDir the install directory
* @param workspaceDir the workspace directory
diff --git a/src/main/java/com/google/devtools/build/lib/profiler/memory/AllocationTracker.java b/src/main/java/com/google/devtools/build/lib/profiler/memory/AllocationTracker.java
index 553c3a7..e99c08a 100644
--- a/src/main/java/com/google/devtools/build/lib/profiler/memory/AllocationTracker.java
+++ b/src/main/java/com/google/devtools/build/lib/profiler/memory/AllocationTracker.java
@@ -276,7 +276,7 @@
enabled = true;
}
- /** Dumps all skylark analysis time allocations to a pprof-compatible file. */
+ /** Dumps all Starlark analysis time allocations to a pprof-compatible file. */
public void dumpSkylarkAllocations(String path) throws IOException {
// Make sure we don't track our own allocations
enabled = false;
diff --git a/src/main/java/com/google/devtools/build/lib/query2/engine/QueryEnvironment.java b/src/main/java/com/google/devtools/build/lib/query2/engine/QueryEnvironment.java
index b3e0dbe..3e0ae03 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/engine/QueryEnvironment.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/engine/QueryEnvironment.java
@@ -471,7 +471,7 @@
void reportBuildFileError(QueryExpression expression, String msg) throws QueryException;
/**
- * Returns the set of BUILD, and optionally Skylark files that define the given set of targets.
+ * Returns the set of BUILD, and optionally Starlark files that define the given set of targets.
* Each such file is itself represented as a target in the result.
*/
ThreadSafeMutableSet<T> getBuildFiles(
diff --git a/src/main/java/com/google/devtools/build/lib/query2/query/aspectresolvers/AspectResolver.java b/src/main/java/com/google/devtools/build/lib/query2/query/aspectresolvers/AspectResolver.java
index e8aea04..c7ba53f 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/query/aspectresolvers/AspectResolver.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/query/aspectresolvers/AspectResolver.java
@@ -70,7 +70,7 @@
DependencyFilter dependencyFilter) throws InterruptedException;
/**
- * Compute the labels of the BUILD Skylark files on which the results of the other two methods
+ * Compute the labels of the BUILD Starlark files on which the results of the other two methods
* depend for a target in the given package.
*/
Set<Label> computeBuildFileDependencies(Package pkg) throws InterruptedException;
diff --git a/src/main/java/com/google/devtools/build/lib/query2/query/output/ProtoOutputFormatter.java b/src/main/java/com/google/devtools/build/lib/query2/query/output/ProtoOutputFormatter.java
index db2573e..5311e97 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/query/output/ProtoOutputFormatter.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/query/output/ProtoOutputFormatter.java
@@ -190,8 +190,8 @@
addAttributes(rulePb, rule, extraDataForAttrHash);
String transitiveHashCode = rule.getRuleClassObject().getRuleDefinitionEnvironmentHashCode();
if (transitiveHashCode != null && includeRuleDefinitionEnvironment()) {
- // The RuleDefinitionEnvironment is always defined for Skylark rules and
- // always null for non Skylark rules.
+ // The RuleDefinitionEnvironment is always defined for Starlark rules and
+ // always null for non Starlark rules.
rulePb.addAttribute(
Build.Attribute.newBuilder()
.setName(RULE_IMPLEMENTATION_HASH_ATTR_NAME)
diff --git a/src/main/java/com/google/devtools/build/lib/rules/AliasConfiguredTarget.java b/src/main/java/com/google/devtools/build/lib/rules/AliasConfiguredTarget.java
index 0426224..7bbc63e 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/AliasConfiguredTarget.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/AliasConfiguredTarget.java
@@ -133,9 +133,9 @@
if (name.equals(LABEL_FIELD)) {
return getLabel();
} else if (name.equals(FILES_FIELD)) {
- // A shortcut for files to build in Skylark. FileConfiguredTarget and RuleConfiguredTarget
+ // A shortcut for files to build in Starlark. FileConfiguredTarget and RuleConfiguredTarget
// always has FileProvider and Error- and PackageGroupConfiguredTarget-s shouldn't be
- // accessible in Skylark.
+ // accessible in Starlark.
return Depset.of(Artifact.TYPE, getProvider(FileProvider.class).getFilesToBuild());
}
return actual.getValue(name);
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSkylarkApiProvider.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSkylarkApiProvider.java
index ae3fb4c..20b6635 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSkylarkApiProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSkylarkApiProvider.java
@@ -31,13 +31,13 @@
import javax.annotation.Nullable;
/**
- * A class that exposes the Android providers to Skylark. It is intended to provide a simple and
- * stable interface for Skylark users.
+ * A class that exposes the Android providers to Starlark. It is intended to provide a simple and
+ * stable interface for Starlark users.
*/
@Immutable
public class AndroidSkylarkApiProvider extends SkylarkApiProvider
implements AndroidSkylarkApiProviderApi<Artifact> {
- /** The name of the field in Skylark used to access this class. */
+ /** The name of the field in Starlark used to access this class. */
public static final String NAME = "android";
private final IdlInfo idlInfo = new IdlInfo();
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSkylarkCommon.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSkylarkCommon.java
index ddf8944..1ba6abf 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSkylarkCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSkylarkCommon.java
@@ -19,7 +19,7 @@
import com.google.devtools.build.lib.skylarkbuildapi.android.AndroidSkylarkCommonApi;
import com.google.devtools.build.lib.skylarkbuildapi.android.AndroidSplitTransititionApi;
-/** Common utilities for Skylark rules related to Android. */
+/** Common utilities for Starlark rules related to Android. */
public class AndroidSkylarkCommon implements AndroidSkylarkCommonApi<Artifact, JavaInfo> {
@Override
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java b/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java
index c79f55d..84d7ec2 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java
@@ -115,9 +115,10 @@
"runtime_deps",
":android_sdk",
"aidl_lib", // for the aidl runtime in the android_sdk rule
- "$toolchain", // this is _toolchain in Skylark rules (b/78647825)
+ "$toolchain", // this is _toolchain in Starlark rules (b/78647825)
// To get from proto_library through proto_lang_toolchain rule to proto runtime library.
- JavaProtoAspectCommon.LITE_PROTO_TOOLCHAIN_ATTR, "runtime");
+ JavaProtoAspectCommon.LITE_PROTO_TOOLCHAIN_ATTR,
+ "runtime");
private static final FlagMatcher DEXOPTS_SUPPORTED_IN_DEXBUILDER =
new FlagMatcher(
@@ -134,7 +135,7 @@
AspectDefinition.Builder result =
new AspectDefinition.Builder(this)
.requireSkylarkProviders(forKey(JavaInfo.PROVIDER.getKey()))
- // Latch onto Skylark toolchains in case they have a "runtime" (b/78647825)
+ // Latch onto Starlark toolchains in case they have a "runtime" (b/78647825)
.requireSkylarkProviders(forKey(ToolchainInfo.PROVIDER.getKey()))
// For android_sdk rules, where we just want to get at aidl runtime deps.
.requireSkylarkProviders(forKey(AndroidSdkProvider.PROVIDER.getKey()))
diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/ApplePlatform.java b/src/main/java/com/google/devtools/build/lib/rules/apple/ApplePlatform.java
index 6d12d9d..f7a76f8 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/apple/ApplePlatform.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/apple/ApplePlatform.java
@@ -177,7 +177,7 @@
return forTargetCpuNullable(targetCpu) != null;
}
- /** Returns a Skylark struct that contains the instances of this enum. */
+ /** Returns a Starlark struct that contains the instances of this enum. */
public static StructImpl getSkylarkStruct() {
Provider constructor = new NativeProvider<StructImpl>(StructImpl.class, "platforms") {};
HashMap<String, Object> fields = new HashMap<>();
@@ -212,7 +212,7 @@
MACOS("macos");
/**
- * The key used to access the enum value as a field in the Skylark apple_common.platform_type
+ * The key used to access the enum value as a field in the Starlark apple_common.platform_type
* struct.
*/
private final String skylarkKey;
@@ -241,7 +241,7 @@
String.format("Unsupported platform type \"%s\"", name));
}
- /** Returns a Skylark struct that contains the instances of this enum. */
+ /** Returns a Starlark struct that contains the instances of this enum. */
public static StructImpl getSkylarkStruct() {
Provider constructor = new NativeProvider<StructImpl>(StructImpl.class, "platform_types") {};
HashMap<String, Object> fields = new HashMap<>();
diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/AvailableXcodesInfo.java b/src/main/java/com/google/devtools/build/lib/rules/apple/AvailableXcodesInfo.java
index 7ef924f..0fd538a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/apple/AvailableXcodesInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/apple/AvailableXcodesInfo.java
@@ -20,7 +20,7 @@
/** The available xcode versions computed from the {@code available_xcodes} rule. */
@Immutable
public class AvailableXcodesInfo extends NativeInfo {
- /** Skylark name for this provider. */
+ /** Starlark name for this provider. */
public static final String SKYLARK_NAME = "AvailableXcodesInfo";
/** Provider identifier for {@link AvailableXcodesInfo}. */
diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeConfigInfo.java b/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeConfigInfo.java
index 97451f3..efd8d92 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeConfigInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeConfigInfo.java
@@ -34,7 +34,7 @@
@Immutable
public class XcodeConfigInfo extends NativeInfo
implements XcodeConfigInfoApi<ApplePlatform, PlatformType> {
- /** Skylark name for this provider. */
+ /** Starlark name for this provider. */
public static final String SKYLARK_NAME = "XcodeVersionConfig";
/** Provider identifier for {@link XcodeConfigInfo}. */
diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeVersionProperties.java b/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeVersionProperties.java
index e879704..bdada11 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeVersionProperties.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeVersionProperties.java
@@ -28,10 +28,10 @@
@Immutable
public class XcodeVersionProperties extends NativeInfo implements XcodePropertiesApi {
- /** Skylark name for the XcodeVersionProperties provider. */
+ /** Starlark name for the XcodeVersionProperties provider. */
public static final String SKYLARK_NAME = "XcodeProperties";
- /** Skylark constructor and identifier for XcodeVersionProperties provider. */
+ /** Starlark constructor and identifier for XcodeVersionProperties provider. */
public static final NativeProvider<XcodeVersionProperties> SKYLARK_CONSTRUCTOR =
new NativeProvider<XcodeVersionProperties>(XcodeVersionProperties.class, SKYLARK_NAME) {};
diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/swift/SwiftConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/apple/swift/SwiftConfiguration.java
index ca1dd6b..176b165 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/apple/swift/SwiftConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/apple/swift/SwiftConfiguration.java
@@ -26,7 +26,7 @@
/**
* A configuration containing flags required for Swift tools. This is used primarily by swift_*
- * family of rules written in Skylark.
+ * family of rules written in Starlark.
*/
@Immutable
public class SwiftConfiguration extends BuildConfiguration.Fragment
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkingHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkingHelper.java
index 1f597e9..91fdc9b 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkingHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkingHelper.java
@@ -61,7 +61,7 @@
public final class CcLinkingHelper {
/** Contains the providers as well as the linking outputs. */
- // TODO(plf): Only used by Skylark API. Remove after migrating.
+ // TODO(plf): Only used by Starlark API. Remove after migrating.
@Deprecated
public static final class LinkingInfo implements LinkingInfoApi {
private final CcLinkingContext ccLinkingContext;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java
index 6aa934d..f14ba5c 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java
@@ -82,7 +82,7 @@
import java.util.Set;
import javax.annotation.Nullable;
-/** A module that contains Skylark utilities for C++ support. */
+/** A module that contains Starlark utilities for C++ support. */
public abstract class CcModule
implements CcModuleApi<
SkylarkActionFactory,
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcSkylarkApiProvider.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcSkylarkApiProvider.java
index c5cf18b..3ffc0a3 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcSkylarkApiProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcSkylarkApiProvider.java
@@ -27,13 +27,13 @@
import com.google.devtools.build.lib.vfs.PathFragment;
/**
- * A class that exposes the C++ providers to Skylark. It is intended to provide a simple and stable
- * interface for Skylark users.
+ * A class that exposes the C++ providers to Starlark. It is intended to provide a simple and stable
+ * interface for Starlark users.
*/
@AutoCodec
public final class CcSkylarkApiProvider extends SkylarkApiProvider
implements CcSkylarkApiProviderApi<Artifact> {
- /** The name of the field in Skylark used to access this class. */
+ /** The name of the field in Starlark used to access this class. */
public static final String NAME = "cc";
public static void maybeAdd(RuleContext ruleContext, RuleConfiguredTargetBuilder builder) {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProvider.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProvider.java
index 0f465e1..323ce89 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProvider.java
@@ -376,7 +376,7 @@
// TODO(bazel-team): delete all of these.
result.put("CROSSTOOLTOP", crosstoolTopPathFragment.getPathString());
- // TODO(kmensah): Remove when skylark dependencies can be updated to rely on
+ // TODO(kmensah): Remove when Starlark dependencies can be updated to rely on
// CcToolchainProvider.
result.putAll(getAdditionalMakeVariables());
@@ -870,8 +870,8 @@
return toolchainIdentifier.contains("llvm");
}
- // Not all of CcToolchainProvider is exposed to Skylark, which makes implementing deep equality
- // impossible: if Java-only parts are considered, the behavior is surprising in Skylark, if they
+ // Not all of CcToolchainProvider is exposed to Starlark, which makes implementing deep equality
+ // impossible: if Java-only parts are considered, the behavior is surprising in Starlark, if they
// are not, the behavior is surprising in Java. Thus, object identity it is.
@Override
public boolean equals(Object other) {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuntimeInfo.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuntimeInfo.java
index afe0a36..c939eab 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuntimeInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuntimeInfo.java
@@ -164,8 +164,8 @@
return Depset.of(Artifact.TYPE, javaBaseInputs());
}
- // Not all of JavaRuntimeInfo is exposed to Skylark, which makes implementing deep equality
- // impossible: if Java-only parts are considered, the behavior is surprising in Skylark, if they
+ // Not all of JavaRuntimeInfo is exposed to Starlark, which makes implementing deep equality
+ // impossible: if Java-only parts are considered, the behavior is surprising in Starlark, if they
// are not, the behavior is surprising in Java. Thus, object identity it is.
@Override
public boolean equals(Object other) {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiProvider.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiProvider.java
index aa50c4e..e76f093 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiProvider.java
@@ -20,19 +20,19 @@
import com.google.devtools.build.lib.skylarkbuildapi.java.JavaSkylarkApiProviderApi;
/**
- * A class that exposes the Java providers to Skylark. It is intended to provide a simple and stable
- * interface for Skylark users.
+ * A class that exposes the Java providers to Starlark. It is intended to provide a simple and
+ * stable interface for Starlark users.
*/
public final class JavaSkylarkApiProvider extends SkylarkApiProvider
implements JavaSkylarkApiProviderApi<Artifact> {
- /** The name of the field in Skylark used to access this class. */
+ /** The name of the field in Starlark used to access this class. */
public static final String NAME = "java";
- /** The name of the field in Skylark proto aspects used to access this class. */
+ /** The name of the field in Starlark proto aspects used to access this class. */
public static final SkylarkProviderIdentifier SKYLARK_NAME =
SkylarkProviderIdentifier.forLegacy(NAME);
/**
- * Creates a Skylark API provider that reads information from its associated target's providers.
+ * Creates a Starlark API provider that reads information from its associated target's providers.
*/
public static JavaSkylarkApiProvider fromRuleContext() {
return new JavaSkylarkApiProvider();
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSkylarkCommon.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSkylarkCommon.java
index 5e7d0df..64bfdd9 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSkylarkCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSkylarkCommon.java
@@ -31,7 +31,7 @@
import com.google.devtools.build.lib.syntax.Starlark;
import com.google.devtools.build.lib.syntax.StarlarkThread;
-/** A module that contains Skylark utilities for Java support. */
+/** A module that contains Starlark utilities for Java support. */
public class JavaSkylarkCommon
implements JavaCommonApi<
Artifact,
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleBinary.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleBinary.java
index 0935f56..90a1e9e 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleBinary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleBinary.java
@@ -125,7 +125,7 @@
* Links a (potentially multi-architecture) binary targeting Apple platforms.
*
* <p>This method comprises a bulk of the logic of the {@code apple_binary} rule, and is
- * statically available so that it may be referenced by Skylark APIs that replicate its
+ * statically available so that it may be referenced by Starlark APIs that replicate its
* functionality.
*
* @param ruleContext the current rule context
@@ -140,7 +140,7 @@
* Links a (potentially multi-architecture) binary targeting Apple platforms.
*
* <p>This method comprises a bulk of the logic of the {@code apple_binary} rule, and is
- * statically available so that it may be referenced by Skylark APIs that replicate its
+ * statically available so that it may be referenced by Starlark APIs that replicate its
* functionality.
*
* @param ruleContext the current rule context
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleDebugOutputsInfo.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleDebugOutputsInfo.java
index b8078da..b40ce3d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleDebugOutputsInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleDebugOutputsInfo.java
@@ -26,7 +26,7 @@
/**
* A provider that holds debug outputs of an Apple binary rule.
*
- * <p>This provider has no native interface and is intended to be read in Skylark code.
+ * <p>This provider has no native interface and is intended to be read in Starlark code.
*
* <p>The only field it has is {@code output_map}, which is a dictionary of: { arch: { output_type:
* Artifact, output_type: Artifact, ... } }
@@ -59,13 +59,12 @@
}
}
- /** Skylark name for the AppleDebugOutputsInfo. */
+ /** Starlark name for the AppleDebugOutputsInfo. */
public static final String SKYLARK_NAME = "AppleDebugOutputs";
- /** Skylark constructor and identifier for AppleDebugOutputsInfo. */
+ /** Starlark constructor and identifier for AppleDebugOutputsInfo. */
public static final NativeProvider<AppleDebugOutputsInfo> SKYLARK_CONSTRUCTOR =
- new NativeProvider<AppleDebugOutputsInfo>(
- AppleDebugOutputsInfo.class, SKYLARK_NAME) {};
+ new NativeProvider<AppleDebugOutputsInfo>(AppleDebugOutputsInfo.class, SKYLARK_NAME) {};
private final ImmutableMap<String, ImmutableMap<String, Artifact>> outputsMap;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleDylibBinaryInfo.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleDylibBinaryInfo.java
index 4905b5d..ce8f592 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleDylibBinaryInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleDylibBinaryInfo.java
@@ -34,10 +34,10 @@
@Immutable
public final class AppleDylibBinaryInfo extends NativeInfo implements AppleDylibBinaryApi {
- /** Skylark name for the AppleDylibBinaryInfo. */
+ /** Starlark name for the AppleDylibBinaryInfo. */
public static final String SKYLARK_NAME = "AppleDylibBinary";
- /** Skylark constructor and identifier for AppleDylibBinaryInfo. */
+ /** Starlark constructor and identifier for AppleDylibBinaryInfo. */
public static final NativeProvider<AppleDylibBinaryInfo> SKYLARK_CONSTRUCTOR =
new NativeProvider<AppleDylibBinaryInfo>(AppleDylibBinaryInfo.class, SKYLARK_NAME) {};
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleDynamicFrameworkInfo.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleDynamicFrameworkInfo.java
index f5bb666..ee34560 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleDynamicFrameworkInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleDynamicFrameworkInfo.java
@@ -42,10 +42,10 @@
public final class AppleDynamicFrameworkInfo extends NativeInfo
implements AppleDynamicFrameworkInfoApi<Artifact> {
- /** Skylark name for the AppleDynamicFrameworkInfo. */
+ /** Starlark name for the AppleDynamicFrameworkInfo. */
public static final String SKYLARK_NAME = "AppleDynamicFramework";
- /** Skylark constructor and identifier for AppleDynamicFrameworkInfo. */
+ /** Starlark constructor and identifier for AppleDynamicFrameworkInfo. */
public static final NativeProvider<AppleDynamicFrameworkInfo> SKYLARK_CONSTRUCTOR =
new NativeProvider<AppleDynamicFrameworkInfo>(
AppleDynamicFrameworkInfo.class, SKYLARK_NAME) {};
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleExecutableBinaryInfo.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleExecutableBinaryInfo.java
index bbe9625..c258479 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleExecutableBinaryInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleExecutableBinaryInfo.java
@@ -35,10 +35,10 @@
public final class AppleExecutableBinaryInfo extends NativeInfo
implements AppleExecutableBinaryApi {
- /** Skylark name for the AppleExecutableBinaryInfo. */
+ /** Starlark name for the AppleExecutableBinaryInfo. */
public static final String SKYLARK_NAME = "AppleExecutableBinary";
- /** Skylark constructor and identifier for AppleExecutableBinaryInfo. */
+ /** Starlark constructor and identifier for AppleExecutableBinaryInfo. */
public static final NativeProvider<AppleExecutableBinaryInfo> SKYLARK_CONSTRUCTOR =
new NativeProvider<AppleExecutableBinaryInfo>(
AppleExecutableBinaryInfo.class, SKYLARK_NAME) {};
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleSkylarkCommon.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleSkylarkCommon.java
index 6cb8d4d..8f6827c 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleSkylarkCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleSkylarkCommon.java
@@ -52,7 +52,7 @@
import java.util.Map;
import javax.annotation.Nullable;
-/** A class that exposes apple rule implementation internals to skylark. */
+/** A class that exposes apple rule implementation internals to Starlark. */
public class AppleSkylarkCommon
implements AppleCommonApi<
Artifact,
@@ -189,7 +189,7 @@
}
@Override
- // This method is registered statically for skylark, and never called directly.
+ // This method is registered statically for Starlark, and never called directly.
public ObjcProvider newObjcProvider(Boolean usesSwift, Dict<?, ?> kwargs, StarlarkThread thread)
throws EvalException {
ObjcProvider.StarlarkBuilder resultBuilder =
@@ -266,7 +266,7 @@
}
/**
- * Creates a Skylark struct that contains the results of the {@code link_multi_arch_binary}
+ * Creates a Starlark struct that contains the results of the {@code link_multi_arch_binary}
* function.
*/
private StructImpl createAppleBinaryOutputSkylarkStruct(
@@ -275,7 +275,7 @@
new NativeProvider<StructImpl>(StructImpl.class, "apple_binary_output") {};
// We have to transform the output group dictionary into one that contains StarlarkValues
// instead
- // of plain NestedSets because the Skylark caller may want to return this directly from their
+ // of plain NestedSets because the Starlark caller may want to return this directly from their
// implementation function.
Map<String, StarlarkValue> outputGroups =
Maps.transformValues(output.getOutputGroups(), v -> Depset.of(Artifact.TYPE, v));
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryInfo.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryInfo.java
index bfa557e..454b3d1 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryInfo.java
@@ -35,7 +35,7 @@
*/
public final class AppleStaticLibraryInfo extends NativeInfo implements AppleStaticLibraryInfoApi {
- /** Skylark constructor and identifier for AppleStaticLibraryInfo. */
+ /** Starlark constructor and identifier for AppleStaticLibraryInfo. */
public static final Provider SKYLARK_CONSTRUCTOR = new Provider();
private final Artifact multiArchArchive;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoProvider.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoProvider.java
index a50e4cf..b0c230d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoProvider.java
@@ -41,10 +41,10 @@
*/
public class ObjcProtoProvider extends NativeInfo {
- /** Skylark name for the ObjcProtoProvider. */
+ /** Starlark name for the ObjcProtoProvider. */
public static final String SKYLARK_NAME = "ObjcProto";
- /** Skylark constructor and identifier for AppleExecutableBinaryInfo. */
+ /** Starlark constructor and identifier for AppleExecutableBinaryInfo. */
public static final NativeProvider<ObjcProtoProvider> SKYLARK_CONSTRUCTOR =
new NativeProvider<ObjcProtoProvider>(ObjcProtoProvider.class, SKYLARK_NAME) {};
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProvider.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProvider.java
index 3d1f189..fbd039e 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProvider.java
@@ -78,7 +78,7 @@
@Immutable
public final class ObjcProvider implements Info, ObjcProviderApi<Artifact> {
- /** Skylark name for the ObjcProvider. */
+ /** Starlark name for the ObjcProvider. */
public static final String SKYLARK_NAME = "objc";
/** Expected suffix for a framework-containing directory. */
@@ -100,9 +100,7 @@
this.type = type;
}
- /**
- * Returns the name of the collection represented by this key in the Skylark provider.
- */
+ /** Returns the name of the collection represented by this key in the Starlark provider. */
public String getSkylarkKeyName() {
return skylarkKeyName;
}
@@ -326,7 +324,7 @@
ImmutableSet.<Key<?>>of(
DEFINE, FRAMEWORK_SEARCH_PATHS, HEADER, INCLUDE, INCLUDE_SYSTEM, IQUOTE);
- /** All keys in ObjcProvider that will be passed in the corresponding Skylark provider. */
+ /** All keys in ObjcProvider that will be passed in the corresponding Starlark provider. */
static final ImmutableList<Key<?>> KEYS_FOR_SKYLARK =
ImmutableList.<Key<?>>of(
DEFINE,
@@ -608,19 +606,20 @@
}
/**
- * All keys in ObjcProvider that are explicitly not exposed to skylark. This is used for
- * testing and verification purposes to ensure that a conscious decision is made for all keys;
- * by default, keys should be exposed to skylark: a comment outlining why a key is omitted
- * from skylark should follow each such case.
- **/
+ * All keys in ObjcProvider that are explicitly not exposed to Starlark. This is used for testing
+ * and verification purposes to ensure that a conscious decision is made for all keys; by default,
+ * keys should be exposed to Starlark: a comment outlining why a key is omitted from Starlark
+ * should follow each such case.
+ */
@VisibleForTesting
- static final ImmutableList<Key<?>> KEYS_NOT_IN_SKYLARK = ImmutableList.<Key<?>>of(
- // LibraryToLink not exposed to skylark.
- CC_LIBRARY,
- // Flag enum is not exposed to skylark.
- FLAG,
- // CppModuleMap is not exposed to skylark.
- TOP_LEVEL_MODULE_MAP);
+ static final ImmutableList<Key<?>> KEYS_NOT_IN_SKYLARK =
+ ImmutableList.<Key<?>>of(
+ // LibraryToLink not exposed to Starlark.
+ CC_LIBRARY,
+ // Flag enum is not exposed to Starlark.
+ FLAG,
+ // CppModuleMap is not exposed to Starlark.
+ TOP_LEVEL_MODULE_MAP);
/**
* Set of {@link ObjcProvider} whose values are not subtracted via {@link #subtractSubtrees}.
@@ -649,8 +648,8 @@
WEAK_SDK_FRAMEWORK);
/**
- * Returns the skylark key for the given string, or null if no such key exists or is available
- * to Skylark.
+ * Returns the Starlark key for the given string, or null if no such key exists or is available to
+ * Starlark.
*/
static Key<?> getSkylarkKeyForString(String keyName) {
for (Key<?> candidateKey : KEYS_FOR_SKYLARK) {
@@ -661,7 +660,7 @@
return null;
}
- /** Skylark constructor and identifier for ObjcProvider. */
+ /** Starlark constructor and identifier for ObjcProvider. */
public static final BuiltinProvider<ObjcProvider> SKYLARK_CONSTRUCTOR = new Constructor();
private ObjcProvider(
@@ -1176,7 +1175,7 @@
}
/**
- * Add elements in toAdd with the given key from skylark. An error is thrown if toAdd is not an
+ * Add elements in toAdd with the given key from Starlark. An error is thrown if toAdd is not an
* appropriate Depset.
*/
void addElementsFromSkylark(Key<?> key, Object skylarkToAdd) throws EvalException {
@@ -1239,7 +1238,7 @@
}
/**
- * Adds the given providers from skylark. An error is thrown if toAdd is not an iterable of
+ * Adds the given providers from Starlark. An error is thrown if toAdd is not an iterable of
* ObjcProvider instances.
*/
@SuppressWarnings("unchecked")
@@ -1269,7 +1268,7 @@
}
/**
- * Adds the given providers from skylark, but propagate any normally-propagated items only to
+ * Adds the given providers from Starlark, but propagate any normally-propagated items only to
* direct dependers. An error is thrown if toAdd is not an iterable of ObjcProvider instances.
*/
@SuppressWarnings("unchecked")
@@ -1296,7 +1295,7 @@
}
/**
- * Adds the given strict include paths from skylark. An error is thrown if skylarkToAdd is not
+ * Adds the given strict include paths from Starlark. An error is thrown if skylarkToAdd is not
* an appropriate Depset.
*/
@SuppressWarnings("unchecked")
