bazel syntax: rename SkylarkDict to Dict
This is a breaking change for copybara.
PiperOrigin-RevId: 280231492
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 e363753..2ac982d 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
@@ -33,12 +33,12 @@
import com.google.devtools.build.lib.packages.Type.ConversionException;
import com.google.devtools.build.lib.skylarkbuildapi.SkylarkNativeModuleApi;
import com.google.devtools.build.lib.skylarkinterface.SkylarkValue;
+import com.google.devtools.build.lib.syntax.Dict;
import com.google.devtools.build.lib.syntax.EvalException;
import com.google.devtools.build.lib.syntax.EvalUtils;
import com.google.devtools.build.lib.syntax.Mutability;
import com.google.devtools.build.lib.syntax.NoneType;
import com.google.devtools.build.lib.syntax.Sequence;
-import com.google.devtools.build.lib.syntax.SkylarkDict;
import com.google.devtools.build.lib.syntax.SkylarkType;
import com.google.devtools.build.lib.syntax.SkylarkUtils;
import com.google.devtools.build.lib.syntax.Starlark;
@@ -130,7 +130,7 @@
SkylarkUtils.checkLoadingOrWorkspacePhase(thread, "native.existing_rule", loc);
PackageContext context = getContext(thread, loc);
Target target = context.pkgBuilder.getTarget(name);
- SkylarkDict<String, Object> rule = targetDict(target, loc, thread.mutability());
+ Dict<String, Object> rule = targetDict(target, loc, thread.mutability());
return rule != null ? rule : Starlark.NONE;
}
@@ -139,16 +139,16 @@
For now, we ignore this, since users can implement it in Skylark.
*/
@Override
- public SkylarkDict<String, SkylarkDict<String, Object>> existingRules(
- Location loc, StarlarkThread thread) throws EvalException, InterruptedException {
+ public Dict<String, Dict<String, Object>> existingRules(Location loc, StarlarkThread thread)
+ throws EvalException, InterruptedException {
SkylarkUtils.checkLoadingOrWorkspacePhase(thread, "native.existing_rules", loc);
PackageContext context = getContext(thread, loc);
Collection<Target> targets = context.pkgBuilder.getTargets();
Mutability mu = thread.mutability();
- SkylarkDict<String, SkylarkDict<String, Object>> rules = SkylarkDict.withMutability(mu);
+ Dict<String, Dict<String, Object>> rules = Dict.withMutability(mu);
for (Target t : targets) {
if (t instanceof Rule) {
- SkylarkDict<String, Object> rule = targetDict(t, loc, mu);
+ Dict<String, Object> rule = targetDict(t, loc, mu);
Preconditions.checkNotNull(rule);
rules.put(t.getName(), rule, loc);
}
@@ -278,12 +278,12 @@
}
@Nullable
- private static SkylarkDict<String, Object> targetDict(Target target, Location loc, Mutability mu)
+ private static Dict<String, Object> targetDict(Target target, Location loc, Mutability mu)
throws EvalException {
if (!(target instanceof Rule)) {
return null;
}
- SkylarkDict<String, Object> values = SkylarkDict.withMutability(mu);
+ Dict<String, Object> values = Dict.withMutability(mu);
Rule rule = (Rule) target;
AttributeContainer cont = rule.getAttributeContainer();
diff --git a/src/main/java/com/google/devtools/build/lib/packages/StructImpl.java b/src/main/java/com/google/devtools/build/lib/packages/StructImpl.java
index 46bcbb3..51d7c6a 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/StructImpl.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/StructImpl.java
@@ -24,11 +24,11 @@
import com.google.devtools.build.lib.skylarkbuildapi.StructApi;
import com.google.devtools.build.lib.skylarkinterface.SkylarkPrinter;
import com.google.devtools.build.lib.syntax.ClassObject;
+import com.google.devtools.build.lib.syntax.Dict;
import com.google.devtools.build.lib.syntax.EvalException;
import com.google.devtools.build.lib.syntax.EvalUtils;
import com.google.devtools.build.lib.syntax.Printer;
import com.google.devtools.build.lib.syntax.Sequence;
-import com.google.devtools.build.lib.syntax.SkylarkDict;
import com.google.devtools.build.lib.syntax.SkylarkType;
import com.google.devtools.build.lib.syntax.Starlark;
import com.google.devtools.build.lib.syntax.StarlarkThread;
@@ -252,8 +252,8 @@
// in the same list but we ignore that for now.
printProtoTextMessage(key, item, sb, indent, loc, "list element in struct field");
}
- } else if (value instanceof SkylarkDict) {
- for (Map.Entry<?, ?> entry : ((SkylarkDict<?, ?>) value).entrySet()) {
+ } else if (value instanceof Dict) {
+ for (Map.Entry<?, ?> entry : ((Dict<?, ?>) value).entrySet()) {
printProtoTextMessage(key, entry, sb, indent, loc, "entry of dictionary");
}
} else {
@@ -302,10 +302,10 @@
printJson(((ClassObject) value).getValue(field), sb, loc, "struct field", field);
}
sb.append("}");
- } else if (value instanceof SkylarkDict) {
+ } else if (value instanceof Dict) {
sb.append("{");
String join = "";
- for (Map.Entry<?, ?> entry : ((SkylarkDict<?, ?>) value).entrySet()) {
+ for (Map.Entry<?, ?> entry : ((Dict<?, ?>) value).entrySet()) {
sb.append(join);
join = ",";
if (!(entry.getKey() instanceof String)) {
diff --git a/src/main/java/com/google/devtools/build/lib/packages/StructProvider.java b/src/main/java/com/google/devtools/build/lib/packages/StructProvider.java
index 12484ea..5cea9b7 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/StructProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/StructProvider.java
@@ -17,8 +17,8 @@
import com.google.common.collect.ImmutableMap;
import com.google.devtools.build.lib.events.Location;
import com.google.devtools.build.lib.skylarkbuildapi.StructApi;
+import com.google.devtools.build.lib.syntax.Dict;
import com.google.devtools.build.lib.syntax.EvalException;
-import com.google.devtools.build.lib.syntax.SkylarkDict;
import java.util.Map;
/**
@@ -37,7 +37,7 @@
}
@Override
- public StructImpl createStruct(SkylarkDict<?, ?> kwargs, Location loc) throws EvalException {
+ public StructImpl createStruct(Dict<?, ?> kwargs, Location loc) throws EvalException {
Map<String, Object> kwargsMap = kwargs.getContents(String.class, Object.class, "kwargs");
if (kwargsMap.containsKey("to_json")) {
throw new EvalException(loc, "cannot override built-in struct function 'to_json'");
diff --git a/src/main/java/com/google/devtools/build/lib/packages/TargetUtils.java b/src/main/java/com/google/devtools/build/lib/packages/TargetUtils.java
index a8d2d9f..e22434d 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/TargetUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/TargetUtils.java
@@ -24,8 +24,8 @@
import com.google.common.collect.Maps;
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.events.Location;
+import com.google.devtools.build.lib.syntax.Dict;
import com.google.devtools.build.lib.syntax.EvalException;
-import com.google.devtools.build.lib.syntax.SkylarkDict;
import com.google.devtools.build.lib.util.Pair;
import java.util.ArrayList;
import java.util.Collection;
@@ -257,7 +257,7 @@
* #legalExecInfoKeys}.
*
* @param executionRequirementsUnchecked execution_requirements of a rule, expected to be of a
- * {@code SkylarkDict<String, String>} type, null or {@link
+ * {@code Dict<String, String>} type, null or {@link
* com.google.devtools.build.lib.syntax.Runtime#NONE}
* @param rule a rule instance to get tags from
* @param allowTagsPropagation if set to true, tags will be propagated from a target to the
@@ -269,7 +269,7 @@
throws EvalException {
Map<String, String> checkedExecutionRequirements =
TargetUtils.filter(
- SkylarkDict.castSkylarkDictOrNoneToDict(
+ Dict.castSkylarkDictOrNoneToDict(
executionRequirementsUnchecked,
String.class,
String.class,
diff --git a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactoryHelper.java b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactoryHelper.java
index e519196..3eb40ed 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactoryHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactoryHelper.java
@@ -25,8 +25,8 @@
import com.google.devtools.build.lib.events.Location;
import com.google.devtools.build.lib.events.StoredEventHandler;
import com.google.devtools.build.lib.packages.RuleFactory.BuildLangTypedAttributeValuesMap;
+import com.google.devtools.build.lib.syntax.Dict;
import com.google.devtools.build.lib.syntax.EvalException;
-import com.google.devtools.build.lib.syntax.SkylarkDict;
import com.google.devtools.build.lib.syntax.StarlarkSemantics;
import java.util.Map;
import java.util.stream.Collectors;
@@ -123,8 +123,7 @@
/**
* Processes {@code repo_mapping} attribute and populates the package builder with the mappings.
*
- * @throws EvalException if {@code repo_mapping} is present in kwargs but is not a {@link
- * SkylarkDict}
+ * @throws EvalException if {@code repo_mapping} is present in kwargs but is not a {@link Dict}
*/
public static void addRepoMappings(
Package.Builder builder,
@@ -134,7 +133,7 @@
throws EvalException, LabelSyntaxException {
if (kwargs.containsKey("repo_mapping")) {
- if (!(kwargs.get("repo_mapping") instanceof SkylarkDict)) {
+ if (!(kwargs.get("repo_mapping") instanceof Dict)) {
throw new EvalException(
location,
"Invalid value for 'repo_mapping': '"
diff --git a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceGlobals.java b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceGlobals.java
index 854e99c..66bd257 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceGlobals.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceGlobals.java
@@ -29,10 +29,10 @@
import com.google.devtools.build.lib.packages.Package.NameConflictException;
import com.google.devtools.build.lib.packages.RuleFactory.InvalidRuleException;
import com.google.devtools.build.lib.skylarkbuildapi.WorkspaceGlobalsApi;
+import com.google.devtools.build.lib.syntax.Dict;
import com.google.devtools.build.lib.syntax.EvalException;
import com.google.devtools.build.lib.syntax.NoneType;
import com.google.devtools.build.lib.syntax.Sequence;
-import com.google.devtools.build.lib.syntax.SkylarkDict;
import com.google.devtools.build.lib.syntax.StarlarkThread;
import com.google.devtools.build.lib.vfs.PathFragment;
import java.util.List;
@@ -63,7 +63,7 @@
@Override
public NoneType workspace(
String name,
- SkylarkDict<?, ?> managedDirectories, // <String, Object>
+ Dict<?, ?> managedDirectories, // <String, Object>
Location loc,
StarlarkThread thread)
throws EvalException, InterruptedException {
