bazel syntax: rename SkylarkDict to Dict
This is a breaking change for copybara.
PiperOrigin-RevId: 280231492
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkActionProviderTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkActionProviderTest.java
index ddff11d..2f464ae 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkActionProviderTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkActionProviderTest.java
@@ -26,8 +26,8 @@
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.packages.SkylarkProvider.SkylarkKey;
import com.google.devtools.build.lib.packages.StructImpl;
+import com.google.devtools.build.lib.syntax.Dict;
import com.google.devtools.build.lib.syntax.Sequence;
-import com.google.devtools.build.lib.syntax.SkylarkDict;
import java.util.List;
import java.util.stream.Collectors;
import org.junit.Test;
@@ -128,11 +128,11 @@
Sequence<String> mnemonics = (Sequence<String>) fooProvider.getValue("mnemonics");
assertThat(mnemonics).containsExactly("MyAction0", "MyAction1");
- Sequence<SkylarkDict<String, String>> envs =
- (Sequence<SkylarkDict<String, String>>) fooProvider.getValue("envs");
- assertThat(envs).containsExactly(
- SkylarkDict.of(null, "foo", "bar", "pet", "puppy"),
- SkylarkDict.of(null, "pet", "bunny"));
+ Sequence<Dict<String, String>> envs =
+ (Sequence<Dict<String, String>>) fooProvider.getValue("envs");
+ assertThat(envs)
+ .containsExactly(
+ Dict.of(null, "foo", "bar", "pet", "puppy"), Dict.of(null, "pet", "bunny"));
Sequence<Sequence<Artifact>> inputs =
(Sequence<Sequence<Artifact>>) fooProvider.getValue("inputs");
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java
index acb9d8f..e647599 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java
@@ -47,10 +47,10 @@
import com.google.devtools.build.lib.skyframe.SkylarkImportLookupFunction;
import com.google.devtools.build.lib.skylark.util.SkylarkTestCase;
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.ParserInput;
-import com.google.devtools.build.lib.syntax.SkylarkDict;
import com.google.devtools.build.lib.syntax.SkylarkNestedSet;
import com.google.devtools.build.lib.syntax.StarlarkFile;
import com.google.devtools.build.lib.syntax.StarlarkList;
@@ -1282,12 +1282,11 @@
StarlarkList.<Object>of(
thread,
StructProvider.STRUCT.create(
- ImmutableMap.<String, Object>of(
- "x", SkylarkDict.<Object, Object>of(thread, 1, 1)),
+ ImmutableMap.<String, Object>of("x", Dict.<Object, Object>of(thread, 1, 1)),
"no field '%s'"),
Tuple.of()),
"b", Tuple.of(),
- "c", SkylarkDict.<Object, Object>of(thread, 2, 2)),
+ "c", Dict.<Object, Object>of(thread, 2, 2)),
"no field '%s'");
}
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java
index fe8fc13..35020bc 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java
@@ -47,8 +47,8 @@
import com.google.devtools.build.lib.rules.java.JavaSourceJarsProvider;
import com.google.devtools.build.lib.rules.python.PyProviderUtils;
import com.google.devtools.build.lib.skylark.util.SkylarkTestCase;
+import com.google.devtools.build.lib.syntax.Dict;
import com.google.devtools.build.lib.syntax.Sequence;
-import com.google.devtools.build.lib.syntax.SkylarkDict;
import com.google.devtools.build.lib.syntax.SkylarkNestedSet;
import com.google.devtools.build.lib.syntax.Starlark;
import com.google.devtools.build.lib.syntax.StarlarkList;
@@ -771,7 +771,7 @@
public void testSkylarkRuleContextGetDefaultShellEnv() throws Exception {
setRuleContext(createRuleContext("//foo:foo"));
Object result = eval("ruleContext.configuration.default_shell_env");
- assertThat(result).isInstanceOf(SkylarkDict.class);
+ assertThat(result).isInstanceOf(Dict.class);
}
@Test
@@ -1867,8 +1867,8 @@
update("actions", provider);
Object mapping = eval("actions.by_file");
- assertThat(mapping).isInstanceOf(SkylarkDict.class);
- assertThat((SkylarkDict) mapping).hasSize(1);
+ assertThat(mapping).isInstanceOf(Dict.class);
+ assertThat((Dict) mapping).hasSize(1);
update("file", eval("ruleContext.attr.dep.files.to_list()[0]"));
Object actionUnchecked = eval("actions.by_file[file]");
assertThat(actionUnchecked).isInstanceOf(ActionAnalysisMetadata.class);
@@ -1971,8 +1971,8 @@
setRuleContext(ruleContext);
Object mapUnchecked = eval("ruleContext.attr.dep.v");
- assertThat(mapUnchecked).isInstanceOf(SkylarkDict.class);
- SkylarkDict<?, ?> map = (SkylarkDict) mapUnchecked;
+ assertThat(mapUnchecked).isInstanceOf(Dict.class);
+ Dict<?, ?> map = (Dict) mapUnchecked;
// Should only have the first action because created_actions() was called
// before the second action was created.
Object file = eval("ruleContext.attr.dep.out1");
@@ -2069,8 +2069,8 @@
setRuleContext(ruleContext);
Object mapUnchecked = eval("ruleContext.attr.dep.v");
- assertThat(mapUnchecked).isInstanceOf(SkylarkDict.class);
- SkylarkDict<?, ?> map = (SkylarkDict) mapUnchecked;
+ assertThat(mapUnchecked).isInstanceOf(Dict.class);
+ Dict<?, ?> map = (Dict) mapUnchecked;
Object out1 = eval("ruleContext.attr.dep.out1");
Object out2 = eval("ruleContext.attr.dep.out2");
Object out3 = eval("ruleContext.attr.dep.out3");
@@ -2173,8 +2173,8 @@
assertThat(contentUnchecked).isEqualTo("bbbbb\nbcdef\n");
Object substitutionsUnchecked = eval("action.substitutions");
- assertThat(substitutionsUnchecked).isInstanceOf(SkylarkDict.class);
- assertThat(substitutionsUnchecked).isEqualTo(SkylarkDict.of(null, "a", "b"));
+ assertThat(substitutionsUnchecked).isInstanceOf(Dict.class);
+ assertThat(substitutionsUnchecked).isEqualTo(Dict.of(null, "a", "b"));
}
private void setUpCoverageInstrumentedTest() throws Exception {
