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/docgen/SkylarkDocumentationTest.java b/src/test/java/com/google/devtools/build/docgen/SkylarkDocumentationTest.java
index d943a5e..1dc4b1f 100644
--- a/src/test/java/com/google/devtools/build/docgen/SkylarkDocumentationTest.java
+++ b/src/test/java/com/google/devtools/build/docgen/SkylarkDocumentationTest.java
@@ -27,8 +27,8 @@
import com.google.devtools.build.lib.skylarkinterface.SkylarkGlobalLibrary;
import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
import com.google.devtools.build.lib.skylarkinterface.SkylarkValue;
+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.StarlarkList;
import com.google.devtools.build.lib.syntax.Tuple;
@@ -160,17 +160,16 @@
@SkylarkModule(name = "MockClassG", doc = "MockClassG")
private static class MockClassG implements SkylarkValue {
@SkylarkCallable(
- name = "test",
- doc = "MockClassG#test",
- parameters = {
- @Param(name = "a", named = false, positional = true),
- @Param(name = "b", named = true, positional = true),
- @Param(name = "c", named = true, positional = false),
- @Param(name = "d", named = true, positional = false, defaultValue = "1"),
- },
- extraKeywords = @Param(name = "myKwargs")
- )
- public Integer test(int a, int b, int c, int d, SkylarkDict<?, ?> kwargs) {
+ name = "test",
+ doc = "MockClassG#test",
+ parameters = {
+ @Param(name = "a", named = false, positional = true),
+ @Param(name = "b", named = true, positional = true),
+ @Param(name = "c", named = true, positional = false),
+ @Param(name = "d", named = true, positional = false, defaultValue = "1"),
+ },
+ extraKeywords = @Param(name = "myKwargs"))
+ public Integer test(int a, int b, int c, int d, Dict<?, ?> kwargs) {
return 0;
}
}
@@ -189,7 +188,7 @@
},
extraPositionals = @Param(name = "myArgs"),
extraKeywords = @Param(name = "myKwargs"))
- public Integer test(int a, int b, int c, int d, Sequence<?> args, SkylarkDict<?, ?> kwargs) {
+ public Integer test(int a, int b, int c, int d, Sequence<?> args, Dict<?, ?> kwargs) {
return 0;
}
}
@@ -213,7 +212,7 @@
},
extraPositionals = @Param(name = "myArgs"),
extraKeywords = @Param(name = "myKwargs"))
- public Integer test(int a, int b, int c, int d, Sequence<?> args, SkylarkDict<?, ?> kwargs) {
+ public Integer test(int a, int b, int c, int d, Sequence<?> args, Dict<?, ?> kwargs) {
return 0;
}
}
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationSkylarkTest.java b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationSkylarkTest.java
index a9ac6e3..08c4889 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationSkylarkTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationSkylarkTest.java
@@ -22,7 +22,7 @@
import com.google.devtools.build.lib.packages.Provider;
import com.google.devtools.build.lib.packages.SkylarkProvider;
import com.google.devtools.build.lib.packages.StructImpl;
-import com.google.devtools.build.lib.syntax.SkylarkDict;
+import com.google.devtools.build.lib.syntax.Dict;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -57,7 +57,6 @@
new SkylarkProvider.SkylarkKey(
Label.parseAbsolute("//examples/rule:config_test.bzl", ImmutableMap.of()), "MyInfo");
StructImpl myInfo = (StructImpl) skylarkTarget.get(key);
- assertThat(((SkylarkDict) myInfo.getValue("test_env")).get("TEST_ENV_VAR"))
- .isEqualTo("my_value");
+ assertThat(((Dict) myInfo.getValue("test_env")).get("TEST_ENV_VAR")).isEqualTo("my_value");
}
}
diff --git a/src/test/java/com/google/devtools/build/lib/packages/TargetUtilsTest.java b/src/test/java/com/google/devtools/build/lib/packages/TargetUtilsTest.java
index 79d7160..baa85f4 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/TargetUtilsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/TargetUtilsTest.java
@@ -18,7 +18,7 @@
import com.google.common.base.Predicate;
import com.google.common.collect.Lists;
import com.google.devtools.build.lib.packages.util.PackageLoadingTestCase;
-import com.google.devtools.build.lib.syntax.SkylarkDict;
+import com.google.devtools.build.lib.syntax.Dict;
import com.google.devtools.build.lib.syntax.Starlark;
import java.util.Map;
import org.junit.Test;
@@ -197,12 +197,12 @@
Map<String, String> execInfo =
TargetUtils.getFilteredExecutionInfo(
- SkylarkDict.of(null, "supports-worker", "1"), noTag, /* allowTagsPropagation */ true);
+ Dict.of(null, "supports-worker", "1"), noTag, /* allowTagsPropagation */ true);
assertThat(execInfo).containsExactly("supports-worker", "1");
execInfo =
TargetUtils.getFilteredExecutionInfo(
- SkylarkDict.of(null, "some-custom-tag", "1", "no-cache", "1"),
+ Dict.of(null, "some-custom-tag", "1", "no-cache", "1"),
noTag,
/* allowTagsPropagation */ true);
assertThat(execInfo).containsExactly("no-cache", "1");
@@ -214,8 +214,7 @@
"tests/BUILD",
"sh_binary(name = 'tag1', srcs=['sh.sh'], tags=['supports-workers', 'no-cache'])");
Rule tag1 = (Rule) getTarget("//tests:tag1");
- SkylarkDict<String, String> executionRequirementsUnchecked =
- SkylarkDict.of(null, "no-remote", "1");
+ Dict<String, String> executionRequirementsUnchecked = Dict.of(null, "no-remote", "1");
Map<String, String> execInfo =
TargetUtils.getFilteredExecutionInfo(
@@ -230,8 +229,7 @@
"tests/BUILD",
"sh_binary(name = 'tag1', srcs=['sh.sh'], tags=['supports-workers', 'no-cache'])");
Rule tag1 = (Rule) getTarget("//tests:tag1");
- SkylarkDict<String, String> executionRequirementsUnchecked =
- SkylarkDict.of(null, "no-cache", "1");
+ Dict<String, String> executionRequirementsUnchecked = Dict.of(null, "no-cache", "1");
Map<String, String> execInfo =
TargetUtils.getFilteredExecutionInfo(
@@ -263,8 +261,7 @@
"tests/BUILD",
"sh_binary(name = 'tag1', srcs=['sh.sh'], tags=['supports-workers', 'no-cache'])");
Rule tag1 = (Rule) getTarget("//tests:tag1");
- SkylarkDict<String, String> executionRequirementsUnchecked =
- SkylarkDict.of(null, "no-remote", "1");
+ Dict<String, String> executionRequirementsUnchecked = Dict.of(null, "no-remote", "1");
Map<String, String> execInfo =
TargetUtils.getFilteredExecutionInfo(
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/SkylarkCcCommonTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/SkylarkCcCommonTest.java
index eb72b8a..9781f68 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/SkylarkCcCommonTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/SkylarkCcCommonTest.java
@@ -50,10 +50,10 @@
import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.VariableWithValue;
import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.WithFeatureSet;
import com.google.devtools.build.lib.rules.cpp.CcToolchainVariables.StringValueParser;
+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.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;
@@ -435,8 +435,8 @@
ConfiguredTarget r = getConfiguredTarget("//a:r");
@SuppressWarnings("unchecked")
- SkylarkDict<String, String> environmentVariables =
- (SkylarkDict<String, String>) getMyInfoFromTarget(r).getValue("environment_variables");
+ Dict<String, String> environmentVariables =
+ (Dict<String, String>) getMyInfoFromTarget(r).getValue("environment_variables");
RuleContext ruleContext = getRuleContext(r);
CcToolchainProvider toolchain =
CppHelper.getToolchain(
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java
index f83c664..0810ebc 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/AppleBinaryTest.java
@@ -40,7 +40,7 @@
import com.google.devtools.build.lib.rules.apple.AppleConfiguration.ConfigurationDistinguisher;
import com.google.devtools.build.lib.rules.objc.AppleBinary.BinaryType;
import com.google.devtools.build.lib.rules.objc.CompilationSupport.ExtraLinkArgs;
-import com.google.devtools.build.lib.syntax.SkylarkDict;
+import com.google.devtools.build.lib.syntax.Dict;
import com.google.devtools.build.lib.testutil.Scratch;
import com.google.devtools.build.lib.testutil.TestConstants;
import com.google.devtools.build.lib.vfs.PathFragment;
@@ -1200,8 +1200,8 @@
assertThat(getSingleArchBinary(lipoAction, "armv7k")).isNotNull();
}
- private SkylarkDict<String, SkylarkDict<String, Artifact>>
- generateAppleDebugOutputsSkylarkProviderMap() throws Exception {
+ private Dict<String, Dict<String, Artifact>> generateAppleDebugOutputsSkylarkProviderMap()
+ throws Exception {
scratch.file("examples/rule/BUILD");
scratch.file(
"examples/rule/apple_rules.bzl",
@@ -1240,16 +1240,16 @@
")");
ConfiguredTarget skylarkTarget = getConfiguredTarget("//examples/apple_skylark:my_target");
- // This cast is safe: struct providers are represented as SkylarkDict.
+ // This cast is safe: struct providers are represented as Dict.
@SuppressWarnings("unchecked")
- SkylarkDict<String, SkylarkDict<String, Artifact>> outputMap =
- (SkylarkDict<String, SkylarkDict<String, Artifact>>)
+ Dict<String, Dict<String, Artifact>> outputMap =
+ (Dict<String, Dict<String, Artifact>>)
getMyInfoFromTarget(skylarkTarget).getValue("outputs_map");
return outputMap;
}
private void checkAppleDebugSymbolProvider_DsymEntries(
- SkylarkDict<String, SkylarkDict<String, Artifact>> outputMap, CompilationMode compilationMode)
+ Dict<String, Dict<String, Artifact>> outputMap, CompilationMode compilationMode)
throws Exception {
assertThat(outputMap).containsKey("arm64");
assertThat(outputMap).containsKey("armv7");
@@ -1272,7 +1272,7 @@
}
private void checkAppleDebugSymbolProvider_LinkMapEntries(
- SkylarkDict<String, SkylarkDict<String, Artifact>> outputMap) throws Exception {
+ Dict<String, Dict<String, Artifact>> outputMap) throws Exception {
assertThat(outputMap).containsKey("arm64");
assertThat(outputMap).containsKey("armv7");
@@ -1323,8 +1323,7 @@
"--apple_generate_dsym",
"--ios_multi_cpus=armv7,arm64,x86_64");
- SkylarkDict<String, SkylarkDict<String, Artifact>> outputMap =
- generateAppleDebugOutputsSkylarkProviderMap();
+ Dict<String, Dict<String, Artifact>> outputMap = generateAppleDebugOutputsSkylarkProviderMap();
checkAppleDebugSymbolProvider_DsymEntries(outputMap, CompilationMode.FASTBUILD);
checkAppleDebugSymbolProvider_LinkMapEntries(outputMap);
}
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcSkylarkTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcSkylarkTest.java
index 701e5b4..41ff8f7 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcSkylarkTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcSkylarkTest.java
@@ -30,7 +30,7 @@
import com.google.devtools.build.lib.packages.StructImpl;
import com.google.devtools.build.lib.rules.apple.AppleToolchain;
import com.google.devtools.build.lib.rules.apple.DottedVersion;
-import com.google.devtools.build.lib.syntax.SkylarkDict;
+import com.google.devtools.build.lib.syntax.Dict;
import com.google.devtools.build.lib.syntax.SkylarkNestedSet;
import com.google.devtools.build.lib.syntax.StarlarkSemantics;
import com.google.devtools.build.lib.vfs.PathFragment;
@@ -367,7 +367,7 @@
Object iosCpu = myInfo.getValue("cpu");
@SuppressWarnings("unchecked")
- SkylarkDict<String, String> env = (SkylarkDict<String, String>) myInfo.getValue("env");
+ Dict<String, String> env = (Dict<String, String>) myInfo.getValue("env");
Object sdkVersion = myInfo.getValue("sdk_version");
assertThat(iosCpu).isEqualTo("i386");
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 {
diff --git a/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/SkylarkCallableProcessorTest.java b/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/SkylarkCallableProcessorTest.java
index 898c6fe..90ec200 100644
--- a/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/SkylarkCallableProcessorTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/SkylarkCallableProcessorTest.java
@@ -261,7 +261,7 @@
.failsToCompile()
.withErrorContaining(
"Expected parameter index 1 to be the "
- + "com.google.devtools.build.lib.syntax.SkylarkDict<?,?> type, matching "
+ + "com.google.devtools.build.lib.syntax.Dict<?,?> type, matching "
+ "extraKeywords, but was java.lang.String");
}
@@ -374,7 +374,7 @@
.failsToCompile()
.withErrorContaining(
"Parameter one has generic type "
- + "com.google.devtools.build.lib.syntax.SkylarkDict<?,java.lang.String>");
+ + "com.google.devtools.build.lib.syntax.Dict<?,java.lang.String>");
}
@Test
diff --git a/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/ExtraKeywordsOutOfOrder.java b/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/ExtraKeywordsOutOfOrder.java
index c46a66e..44d89d3 100644
--- a/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/ExtraKeywordsOutOfOrder.java
+++ b/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/ExtraKeywordsOutOfOrder.java
@@ -18,7 +18,7 @@
import com.google.devtools.build.lib.skylarkinterface.Param;
import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable;
import com.google.devtools.build.lib.skylarkinterface.SkylarkValue;
-import com.google.devtools.build.lib.syntax.SkylarkDict;
+import com.google.devtools.build.lib.syntax.Dict;
import com.google.devtools.build.lib.syntax.StarlarkThread;
/**
@@ -35,7 +35,7 @@
useLocation = true,
useStarlarkThread = true)
public String threeArgMethod(
- SkylarkDict<?, ?> kwargs, String one, Location location, StarlarkThread thread) {
+ Dict<?, ?> kwargs, String one, Location location, StarlarkThread thread) {
return "bar";
}
}
diff --git a/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/GoldenCase.java b/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/GoldenCase.java
index a2214dc..78d36aa 100644
--- a/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/GoldenCase.java
+++ b/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/GoldenCase.java
@@ -19,9 +19,9 @@
import com.google.devtools.build.lib.skylarkinterface.ParamType;
import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable;
import com.google.devtools.build.lib.skylarkinterface.SkylarkValue;
+import com.google.devtools.build.lib.syntax.Dict;
import com.google.devtools.build.lib.syntax.FuncallExpression;
import com.google.devtools.build.lib.syntax.Sequence;
-import com.google.devtools.build.lib.syntax.SkylarkDict;
import com.google.devtools.build.lib.syntax.StarlarkSemantics;
import com.google.devtools.build.lib.syntax.StarlarkThread;
@@ -174,7 +174,7 @@
public String twoArgMethodWithParamsAndInfoAndKwargs(
String one,
Integer two,
- SkylarkDict<?, ?> kwargs,
+ Dict<?, ?> kwargs,
Location location,
FuncallExpression ast,
StarlarkThread thread,
@@ -193,7 +193,7 @@
extraKeywords = @Param(name = "kwargs"),
useStarlarkThread = true)
public String twoArgMethodWithParamsAndInfoAndKwargs(
- String one, Integer two, Sequence<?> args, SkylarkDict<?, ?> kwargs, StarlarkThread thread) {
+ String one, Integer two, Sequence<?> args, Dict<?, ?> kwargs, StarlarkThread thread) {
return "yar";
}
@@ -227,9 +227,9 @@
documented = false,
parameters = {
@Param(name = "one", type = Sequence.class, named = true),
- @Param(name = "two", type = SkylarkDict.class, named = true),
+ @Param(name = "two", type = Dict.class, named = true),
})
- public String methodWithListandDict(Sequence<?> one, SkylarkDict<?, ?> two) {
+ public String methodWithListandDict(Sequence<?> one, Dict<?, ?> two) {
return "bar";
}
}
diff --git a/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/SpecifiedGenericType.java b/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/SpecifiedGenericType.java
index 19dbae0..a3ea309 100644
--- a/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/SpecifiedGenericType.java
+++ b/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/SpecifiedGenericType.java
@@ -17,8 +17,8 @@
import com.google.devtools.build.lib.skylarkinterface.Param;
import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable;
import com.google.devtools.build.lib.skylarkinterface.SkylarkValue;
+import com.google.devtools.build.lib.syntax.Dict;
import com.google.devtools.build.lib.syntax.Sequence;
-import com.google.devtools.build.lib.syntax.SkylarkDict;
/**
* Test case for a SkylarkCallable method which has a parameter with an unsafely specified generic
@@ -33,7 +33,7 @@
parameters = {
@Param(name = "one", type = Sequence.class, named = true),
})
- public String specifiedGenericType(SkylarkDict<?, String> one) {
+ public String specifiedGenericType(Dict<?, String> one) {
return "bar";
}
}
diff --git a/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/StructFieldWithExtraKeywords.java b/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/StructFieldWithExtraKeywords.java
index a98f7dc..8b4b8e5 100644
--- a/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/StructFieldWithExtraKeywords.java
+++ b/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/StructFieldWithExtraKeywords.java
@@ -17,18 +17,17 @@
import com.google.devtools.build.lib.skylarkinterface.Param;
import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable;
import com.google.devtools.build.lib.skylarkinterface.SkylarkValue;
-import com.google.devtools.build.lib.syntax.SkylarkDict;
+import com.google.devtools.build.lib.syntax.Dict;
/** Test case which verifies a struct field method cannot specify extraArgs. */
public class StructFieldWithExtraKeywords implements SkylarkValue {
@SkylarkCallable(
- name = "struct_field_method_with_extra_kwargs",
- documented = false,
- structField = true,
- extraKeywords = @Param(name = "kwargs")
- )
- public String structFieldMethodWithExtraKeywords(SkylarkDict<?, ?> args) {
+ name = "struct_field_method_with_extra_kwargs",
+ documented = false,
+ structField = true,
+ extraKeywords = @Param(name = "kwargs"))
+ public String structFieldMethodWithExtraKeywords(Dict<?, ?> args) {
return "Dog.";
}
}
diff --git a/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/ToggledKwargsParam.java b/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/ToggledKwargsParam.java
index 0ba4095..c0c2401 100644
--- a/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/ToggledKwargsParam.java
+++ b/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/ToggledKwargsParam.java
@@ -17,8 +17,8 @@
import com.google.devtools.build.lib.skylarkinterface.Param;
import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable;
import com.google.devtools.build.lib.skylarkinterface.SkylarkValue;
+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.StarlarkSemantics.FlagIdentifier;
import com.google.devtools.build.lib.syntax.StarlarkThread;
@@ -42,7 +42,7 @@
enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_BUILD_SETTING_API),
useStarlarkThread = true)
public String toggledKwargsMethod(
- String one, Integer two, Sequence<?> args, SkylarkDict<?, ?> kwargs, StarlarkThread thread) {
+ String one, Integer two, Sequence<?> args, Dict<?, ?> kwargs, StarlarkThread thread) {
return "cat";
}
}
diff --git a/src/test/java/com/google/devtools/build/lib/syntax/EvalUtilsTest.java b/src/test/java/com/google/devtools/build/lib/syntax/EvalUtilsTest.java
index 2d7d8f8..33363fb 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/EvalUtilsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/EvalUtilsTest.java
@@ -40,8 +40,8 @@
return StarlarkList.of(thread, 1, 2, 3);
}
- private static SkylarkDict<Object, Object> makeDict(StarlarkThread thread) {
- return SkylarkDict.of(thread, 1, 1, 2, 2);
+ private static Dict<Object, Object> makeDict(StarlarkThread thread) {
+ return Dict.of(thread, 1, 1, 2, 2);
}
/** MockClassA */
@@ -99,8 +99,8 @@
Tuple.of("1", "2", "3"),
StarlarkList.of(thread, 1, 2, 3),
StarlarkList.of(thread, "1", "2", "3"),
- SkylarkDict.of(thread, "key", 123),
- SkylarkDict.of(thread, 123, "value"),
+ Dict.of(thread, "key", 123),
+ Dict.of(thread, 123, "value"),
NestedSetBuilder.stableOrder().add(1).add(2).add(3).build(),
StructProvider.STRUCT.create(ImmutableMap.of("key", (Object) "value"), "no field %s"),
};
diff --git a/src/test/java/com/google/devtools/build/lib/syntax/EvaluationTest.java b/src/test/java/com/google/devtools/build/lib/syntax/EvaluationTest.java
index 5dea7d8..21a47036 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/EvaluationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/EvaluationTest.java
@@ -195,7 +195,7 @@
final Map<String, Object> kwargs,
FuncallExpression ast,
StarlarkThread thread) {
- return SkylarkDict.copyOf(thread, kwargs);
+ return Dict.copyOf(thread, kwargs);
}
};
diff --git a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java
index 231b373..aad2c31 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java
@@ -439,16 +439,14 @@
}
@SkylarkCallable(
- name = "with_kwargs",
- documented = false,
- parameters = {
- @Param(name = "pos", defaultValue = "False", type = Boolean.class),
- @Param(name = "named", type = Boolean.class, positional = false, named = true),
- },
- extraKeywords = @Param(name = "kwargs")
- )
- public String withKwargs(boolean pos, boolean named, SkylarkDict<?, ?> kwargs)
- throws EvalException {
+ name = "with_kwargs",
+ documented = false,
+ parameters = {
+ @Param(name = "pos", defaultValue = "False", type = Boolean.class),
+ @Param(name = "named", type = Boolean.class, positional = false, named = true),
+ },
+ extraKeywords = @Param(name = "kwargs"))
+ public String withKwargs(boolean pos, boolean named, Dict<?, ?> kwargs) throws EvalException {
String kwargsString =
"kwargs("
+ kwargs
@@ -469,7 +467,7 @@
},
extraPositionals = @Param(name = "args"),
extraKeywords = @Param(name = "kwargs"))
- public String withArgsAndKwargs(String foo, Sequence<?> args, SkylarkDict<?, ?> kwargs)
+ public String withArgsAndKwargs(String foo, Sequence<?> args, Dict<?, ?> kwargs)
throws EvalException {
String argsString =
"args(" + args.stream().map(Printer::debugPrint).collect(joining(", ")) + ")";
@@ -1751,10 +1749,9 @@
@Test
public void testDictAssignmentAsLValueSideEffects() throws Exception {
- new SkylarkTest().setUp("def func(d):",
- " d['b'] = 2",
- "d = {'a' : 1}",
- "func(d)").testLookup("d", SkylarkDict.of(null, "a", 1, "b", 2));
+ new SkylarkTest()
+ .setUp("def func(d):", " d['b'] = 2", "d = {'a' : 1}", "func(d)")
+ .testLookup("d", Dict.of(null, "a", 1, "b", 2));
}
@Test
diff --git a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkMutableTest.java b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkMutableTest.java
index d7ba159..bb41a82 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkMutableTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkMutableTest.java
@@ -67,7 +67,7 @@
@Test
public void testDictViewsCheckMutability() throws Exception {
Mutability mutability = Mutability.create("test");
- SkylarkDict<Object, Object> dict = SkylarkDict.copyOf(mutability, ImmutableMap.of(1, 2, 3, 4));
+ Dict<Object, Object> dict = Dict.copyOf(mutability, ImmutableMap.of(1, 2, 3, 4));
mutability.freeze();
{
