BEGIN_PUBLIC
starlark: infinite precision ints
BEWARE: j.l.Integer is no longer a legal Starlark value.
This change makes the Starlark 'int' type a bigint,
aka infinite-precision integer, one capable of exact arithmetic
on any integer value. The new Int class has three subclasses,
similar to j.l.Integer, j.l.Long, and j.l.BigInteger.
The most compact representation is always used.
This makes Starlark capable of handling all the integer
types that occur in protocol messages---signed and unsigned
64-bit values.
Memory usage should not change much because StarlarkInt.Int32
has the same layout as the j.l.Integer it replaces.
As with j.l.Integer, small values (<100,000) are cached
to avoid unnecessary allocation.
Integer is no longer a legal Starlark value type. However,
for compatibility and convenience, parameters of
StarlarkMethod-annotated Java functions may continue to
use Integer to mean "32-bit signed int". The interpreter
does a "reboxing" operation to convert Int arguments
to Integer parameters as needed. Also, such functions may
return Integer values, and they will be reboxed by fromJava,
similar to List and Map. However, just as one cannot return
List and Map values nested inside Starlark data structures,
nor can one nest Integers in them; an explicit boxing operation
is required: StarlarkInt.of(x).
To limit the scope of this change, it does not yet add support
for parsing bigint literals. That will come in a follow-up.
Bazel: attr.int(..) rule attributes now use Int instead of
Integer. This is necessary because the assumption that Attribute
values are all legal Starlark values seems to be widely relied on.
However, int attributes remain restricted to the signed 32-bit
part of the value range. (Changing this would have much greater
ramifications for Bazel.) Every access of an int-valued rule
attribute must now call toIntUnchecked(), which cannot fail.
Suggested reading order:
- eval.StarlarkInt, the new type.
- the rest of eval, which does reboxing.
- trivial updates to tests of the interpreter.
(Most of these tests belong in testdata/*.star files.)
- lib.packages attribute changes.
- the rest, which is mostly trivial updates.
The most obvious downsides of this change are the loss of implicit
boxing, the potential for latent errors due to the lack of dynamic
checkValid calls in (e.g.) Dict.put, and the need to tell other Java
packages (such as the Gson JSON package) that Int is basically a
version of Integer, which it already knows about.
I have no doubt missed a few spots, and we may encounter a few
unhelpful "want int, got int" errors when an Integer value
sneaks into the Starlark value realm. I will fix them as they
arise.
Credit to Jon Brandvein for b/36358845#comment9. Before it, I
had resigned myself to this feature being infeasible in Starlark/Java.
END_PUBLIC
PiperOrigin-RevId: 334649352
diff --git a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkDefinedAspectsTest.java b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkDefinedAspectsTest.java
index fb74540..fb8086a 100644
--- a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkDefinedAspectsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkDefinedAspectsTest.java
@@ -52,6 +52,7 @@
import com.google.devtools.build.lib.skyframe.AspectValueKey.AspectKey;
import com.google.devtools.build.lib.vfs.FileSystemUtils;
import net.starlark.java.eval.Sequence;
+import net.starlark.java.eval.StarlarkInt;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -2460,7 +2461,7 @@
new StarlarkProvider.Key(
Label.parseAbsolute("//test:aspect.bzl", ImmutableMap.of()), "PCollector");
StructImpl collector = (StructImpl) configuredAspect.get(pCollector);
- assertThat(collector.getValue("attr_value")).isEqualTo(30);
+ assertThat(collector.getValue("attr_value")).isEqualTo(StarlarkInt.of(30));
}
@Test
@@ -2515,7 +2516,7 @@
new StarlarkProvider.Key(
Label.parseAbsolute("//test:aspect.bzl", ImmutableMap.of()), "PCollector");
StructImpl collector = (StructImpl) configuredAspect.get(pCollector);
- assertThat(collector.getValue("attr_value")).isEqualTo(30);
+ assertThat(collector.getValue("attr_value")).isEqualTo(StarlarkInt.of(30));
}
@Test
diff --git a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkIntegrationTest.java b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkIntegrationTest.java
index 8d17f32..ac0aa23 100644
--- a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkIntegrationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkIntegrationTest.java
@@ -59,6 +59,7 @@
import net.starlark.java.eval.NoneType;
import net.starlark.java.eval.Sequence;
import net.starlark.java.eval.Starlark;
+import net.starlark.java.eval.StarlarkInt;
import net.starlark.java.eval.StarlarkList;
import org.junit.Before;
import org.junit.Test;
@@ -1412,7 +1413,7 @@
StructImpl declaredProvider = (StructImpl) configuredTarget.get(key);
assertThat(declaredProvider).isNotNull();
assertThat(declaredProvider.getProvider().getKey()).isEqualTo(key);
- assertThat(declaredProvider.getValue("x")).isEqualTo(1);
+ assertThat(declaredProvider.getValue("x")).isEqualTo(StarlarkInt.of(1));
}
@Test
@@ -1437,7 +1438,7 @@
StructImpl declaredProvider = (StructImpl) configuredTarget.get(key);
assertThat(declaredProvider).isNotNull();
assertThat(declaredProvider.getProvider().getKey()).isEqualTo(key);
- assertThat(declaredProvider.getValue("x")).isEqualTo(1);
+ assertThat(declaredProvider.getValue("x")).isEqualTo(StarlarkInt.of(1));
}
@Test
@@ -1463,7 +1464,7 @@
StructImpl declaredProvider = (StructImpl) configuredTarget.get(key);
assertThat(declaredProvider).isNotNull();
assertThat(declaredProvider.getProvider().getKey()).isEqualTo(key);
- assertThat(declaredProvider.getValue("x")).isEqualTo(1);
+ assertThat(declaredProvider.getValue("x")).isEqualTo(StarlarkInt.of(1));
}
@Test
diff --git a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkOptionsParsingTest.java b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkOptionsParsingTest.java
index ea16805..ab72af3 100644
--- a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkOptionsParsingTest.java
+++ b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkOptionsParsingTest.java
@@ -23,6 +23,7 @@
import com.google.devtools.build.lib.util.Pair;
import com.google.devtools.common.options.OptionsParsingException;
import com.google.devtools.common.options.OptionsParsingResult;
+import net.starlark.java.eval.StarlarkInt;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -39,7 +40,8 @@
OptionsParsingResult result = parseStarlarkOptions("--//test:my_int_setting=666");
assertThat(result.getStarlarkOptions()).hasSize(1);
- assertThat(result.getStarlarkOptions().get("//test:my_int_setting")).isEqualTo(666);
+ assertThat(result.getStarlarkOptions().get("//test:my_int_setting"))
+ .isEqualTo(StarlarkInt.of(666));
assertThat(result.getResidue()).isEmpty();
}
@@ -51,7 +53,8 @@
OptionsParsingResult result = parseStarlarkOptions("--//test:my_int_setting 666");
assertThat(result.getStarlarkOptions()).hasSize(1);
- assertThat(result.getStarlarkOptions().get("//test:my_int_setting")).isEqualTo(666);
+ assertThat(result.getStarlarkOptions().get("//test:my_int_setting"))
+ .isEqualTo(StarlarkInt.of(666));
assertThat(result.getResidue()).isEmpty();
}
@@ -66,7 +69,7 @@
assertThat(result.getStarlarkOptions()).hasSize(1);
assertThat(result.getStarlarkOptions().get("@starlark_options_test//test:my_int_setting"))
- .isEqualTo(666);
+ .isEqualTo(StarlarkInt.of(666));
assertThat(result.getResidue()).isEmpty();
}
@@ -206,7 +209,8 @@
parseStarlarkOptions("--//test:my_int_setting=4 --//test:my_int_setting=7");
assertThat(result.getStarlarkOptions()).hasSize(1);
- assertThat(result.getStarlarkOptions().get("//test:my_int_setting")).isEqualTo(7);
+ assertThat(result.getStarlarkOptions().get("//test:my_int_setting"))
+ .isEqualTo(StarlarkInt.of(7));
assertThat(result.getResidue()).isEmpty();
}
@@ -232,8 +236,10 @@
assertThat(result.getResidue()).isEmpty();
assertThat(result.getStarlarkOptions()).hasSize(2);
- assertThat(result.getStarlarkOptions().get("//test:my_int_setting")).isEqualTo(0);
- assertThat(result.getStarlarkOptions().get("//test:my_other_int_setting")).isEqualTo(0);
+ assertThat(result.getStarlarkOptions().get("//test:my_int_setting"))
+ .isEqualTo(StarlarkInt.of(0));
+ assertThat(result.getStarlarkOptions().get("//test:my_other_int_setting"))
+ .isEqualTo(StarlarkInt.of(0));
}
// test --non_build_setting
@@ -318,7 +324,8 @@
OptionsParsingResult result = parseStarlarkOptions("--//test:my_int_setting=15");
- assertThat(result.getStarlarkOptions().get("//test:my_int_setting")).isEqualTo(15);
+ assertThat(result.getStarlarkOptions().get("//test:my_int_setting"))
+ .isEqualTo(StarlarkInt.of(15));
}
@Test
diff --git a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleClassFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleClassFunctionsTest.java
index 7a87200..45c3d2b 100644
--- a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleClassFunctionsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleClassFunctionsTest.java
@@ -61,6 +61,7 @@
import net.starlark.java.eval.Module;
import net.starlark.java.eval.Mutability;
import net.starlark.java.eval.Starlark;
+import net.starlark.java.eval.StarlarkInt;
import net.starlark.java.eval.StarlarkList;
import net.starlark.java.eval.Tuple;
import net.starlark.java.syntax.ParserInput;
@@ -639,8 +640,8 @@
public void testAttrIntValues() throws Exception {
Attribute attr = buildAttribute("a1", "attr.int(values = [1, 2])");
PredicateWithMessage<Object> predicate = attr.getAllowedValues();
- assertThat(predicate.apply(2)).isTrue();
- assertThat(predicate.apply(3)).isFalse();
+ assertThat(predicate.apply(StarlarkInt.of(2))).isTrue();
+ assertThat(predicate.apply(StarlarkInt.of(3))).isFalse();
}
@Test
@@ -893,7 +894,50 @@
"r1 = rule(impl, attrs = {'a1': attr.int(default = 40+2)})");
RuleClass c = ((StarlarkRuleFunction) ev.lookup("r1")).getRuleClass();
Attribute a = c.getAttributeByName("a1");
- assertThat(a.getDefaultValueUnchecked()).isEqualTo(42);
+ assertThat(a.getDefaultValueUnchecked()).isEqualTo(StarlarkInt.of(42));
+ }
+
+ @Test
+ public void testIntDefaultValueMustBeInt32() throws Exception {
+ // This is a test of the loading phase. Move somewhere more appropriate.
+ ev.checkEvalErrorContains(
+ "for parameter 'default' of attribute '', got 4294967296, want value in signed 32-bit"
+ + " range",
+ "attr.int(default = 0x10000 * 0x10000)");
+ ev.checkEvalErrorContains(
+ "for element 0 of parameter 'default' of attribute '', got 4294967296, want value in"
+ + " signed 32-bit range",
+ "attr.int_list(default = [0x10000 * 0x10000])");
+ }
+
+ @Test
+ public void testIntAttributeValueMustBeInt32() throws Exception {
+ // This is a test of the loading phase. Move somewhere more appropriate.
+ scratch.file(
+ "p/inc.bzl", //
+ "def _impl(ctx): pass",
+ "r = rule(_impl, attrs = dict(i=attr.int()))");
+ scratch.file(
+ "p/BUILD", //
+ "load('inc.bzl', 'r')",
+ "r(name = 'p', i = 0x10000 * 0x10000)");
+ AssertionError expected = assertThrows(AssertionError.class, () -> createRuleContext("//p"));
+ assertThat(expected)
+ .hasMessageThat()
+ .contains(
+ "for attribute 'i' in 'r' rule, got 4294967296, want value in signed 32-bit range");
+ }
+
+ @Test
+ public void testIntegerConcatTruncates() throws Exception {
+ // The Type.INTEGER.concat operator, as used to resolve select(int)+select(int)
+ // after rule construction, has a range of int32.
+ scratch.file(
+ "p/BUILD", //
+ "s = select({'//conditions:default': -0x7fffffff})", // -0x7fffffff + -0x7fffffff = 2
+ "cc_test(name='c', shard_count = s+s)");
+ StarlarkRuleContext context = createRuleContext("//p:c");
+ assertThat(context.getAttr().getValue("shard_count")).isEqualTo(StarlarkInt.of(2));
}
@Test
@@ -1126,8 +1170,8 @@
// TODO(fwe): cannot be handled by current testing suite
ev.exec("x = struct(a = 1, b = 2)");
ClassObject x = (ClassObject) ev.lookup("x");
- assertThat(x.getValue("a")).isEqualTo(1);
- assertThat(x.getValue("b")).isEqualTo(2);
+ assertThat(x.getValue("a")).isEqualTo(StarlarkInt.of(1));
+ assertThat(x.getValue("b")).isEqualTo(StarlarkInt.of(2));
}
@Test
@@ -1162,8 +1206,8 @@
@Test
public void testStructAccessingFieldsFromStarlark() throws Exception {
ev.exec("x = struct(a = 1, b = 2)", "x1 = x.a", "x2 = x.b");
- assertThat(ev.lookup("x1")).isEqualTo(1);
- assertThat(ev.lookup("x2")).isEqualTo(2);
+ assertThat(ev.lookup("x1")).isEqualTo(StarlarkInt.of(1));
+ assertThat(ev.lookup("x2")).isEqualTo(StarlarkInt.of(2));
}
@Test
@@ -1189,7 +1233,7 @@
@Test
public void testStructAccessingFunctionFieldWithArgs() throws Exception {
ev.exec("def f(x): return x+5", "x = struct(a = f, b = 2)", "x1 = x.a(1)");
- assertThat(ev.lookup("x1")).isEqualTo(6);
+ assertThat(ev.lookup("x1")).isEqualTo(StarlarkInt.of(6));
}
@Test
@@ -1217,10 +1261,10 @@
"y = struct(c = 1, d = 2)",
"z = x + y\n");
StructImpl z = (StructImpl) ev.lookup("z");
- assertThat(z.getValue("a")).isEqualTo(1);
- assertThat(z.getValue("b")).isEqualTo(2);
- assertThat(z.getValue("c")).isEqualTo(1);
- assertThat(z.getValue("d")).isEqualTo(2);
+ assertThat(z.getValue("a")).isEqualTo(StarlarkInt.of(1));
+ assertThat(z.getValue("b")).isEqualTo(StarlarkInt.of(2));
+ assertThat(z.getValue("c")).isEqualTo(StarlarkInt.of(1));
+ assertThat(z.getValue("d")).isEqualTo(StarlarkInt.of(2));
}
@Test
@@ -1243,10 +1287,10 @@
" return x",
"x = func()");
StructImpl x = (StructImpl) ev.lookup("x");
- assertThat(x.getValue("a")).isEqualTo(1);
- assertThat(x.getValue("b")).isEqualTo(2);
- assertThat(x.getValue("c")).isEqualTo(1);
- assertThat(x.getValue("d")).isEqualTo(2);
+ assertThat(x.getValue("a")).isEqualTo(StarlarkInt.of(1));
+ assertThat(x.getValue("b")).isEqualTo(StarlarkInt.of(2));
+ assertThat(x.getValue("c")).isEqualTo(StarlarkInt.of(1));
+ assertThat(x.getValue("d")).isEqualTo(StarlarkInt.of(2));
}
@Test
@@ -1301,7 +1345,7 @@
"s = struct(x = {'a' : 1})", //
"s.x['b'] = 2\n");
assertThat(((StructImpl) ev.lookup("s")).getValue("x"))
- .isEqualTo(ImmutableMap.of("a", 1, "b", 2));
+ .isEqualTo(ImmutableMap.of("a", StarlarkInt.of(1), "b", StarlarkInt.of(2)));
}
@Test
@@ -1324,21 +1368,22 @@
StarlarkList.<Object>of(
mu,
StructProvider.STRUCT.create(
- ImmutableMap.<String, Object>of("x", Dict.<Object, Object>of(mu, 1, 1)),
+ ImmutableMap.<String, Object>of(
+ "x", Dict.<Object, Object>of(mu, StarlarkInt.of(1), StarlarkInt.of(1))),
"no field '%s'"),
Tuple.of()),
"b", Tuple.of(),
- "c", Dict.<Object, Object>of(mu, 2, 2)),
+ "c", Dict.<Object, Object>of(mu, StarlarkInt.of(2), StarlarkInt.of(2))),
"no field '%s'");
}
@Test
public void testStructMutabilityShallow() throws Exception {
- assertThat(Starlark.isImmutable(makeStruct("a", 1))).isTrue();
+ assertThat(Starlark.isImmutable(makeStruct("a", StarlarkInt.of(1)))).isTrue();
}
private static StarlarkList<Object> makeList(@Nullable Mutability mu) {
- return StarlarkList.<Object>of(mu, 1, 2, 3);
+ return StarlarkList.<Object>of(mu, StarlarkInt.of(1), StarlarkInt.of(2), StarlarkInt.of(3));
}
@Test
@@ -1356,7 +1401,7 @@
@Test
public void declaredProviders() throws Exception {
evalAndExport(ev, "data = provider()", "d = data(x = 1, y ='abc')", "d_x = d.x", "d_y = d.y");
- assertThat(ev.lookup("d_x")).isEqualTo(1);
+ assertThat(ev.lookup("d_x")).isEqualTo(StarlarkInt.of(1));
assertThat(ev.lookup("d_y")).isEqualTo("abc");
StarlarkProvider dataConstructor = (StarlarkProvider) ev.lookup("data");
StructImpl data = (StructImpl) ev.lookup("d");
@@ -1376,7 +1421,7 @@
"dxy = dx + dy",
"x = dxy.x",
"y = dxy.y");
- assertThat(ev.lookup("x")).isEqualTo(1);
+ assertThat(ev.lookup("x")).isEqualTo(StarlarkInt.of(1));
assertThat(ev.lookup("y")).isEqualTo("abc");
StarlarkProvider dataConstructor = (StarlarkProvider) ev.lookup("data");
StructImpl dx = (StructImpl) ev.lookup("dx");
@@ -1406,8 +1451,8 @@
"d3 = d1 + d2",
"f1 = d3.f1",
"f2 = d3.f2");
- assertThat(ev.lookup("f1")).isEqualTo(4);
- assertThat(ev.lookup("f2")).isEqualTo(5);
+ assertThat(ev.lookup("f1")).isEqualTo(StarlarkInt.of(4));
+ assertThat(ev.lookup("f2")).isEqualTo(StarlarkInt.of(5));
}
@Test
@@ -1632,8 +1677,8 @@
StarlarkInfo p1 = (StarlarkInfo) ev.lookup("p1");
assertThat(p1.getProvider()).isEqualTo(p);
- assertThat(ev.lookup("x")).isEqualTo(1);
- assertThat(ev.lookup("y")).isEqualTo(2);
+ assertThat(ev.lookup("x")).isEqualTo(StarlarkInt.of(1));
+ assertThat(ev.lookup("y")).isEqualTo(StarlarkInt.of(2));
}
@Test
@@ -1648,8 +1693,8 @@
StarlarkInfo p1 = (StarlarkInfo) ev.lookup("p1");
assertThat(p1.getProvider()).isEqualTo(p);
- assertThat(ev.lookup("x")).isEqualTo(1);
- assertThat(ev.lookup("y")).isEqualTo(2);
+ assertThat(ev.lookup("x")).isEqualTo(StarlarkInt.of(1));
+ assertThat(ev.lookup("y")).isEqualTo(StarlarkInt.of(2));
}
@Test
@@ -1663,7 +1708,7 @@
StarlarkInfo p1 = (StarlarkInfo) ev.lookup("p1");
assertThat(p1.getProvider()).isEqualTo(p);
- assertThat(ev.lookup("y")).isEqualTo(2);
+ assertThat(ev.lookup("y")).isEqualTo(StarlarkInt.of(2));
}
@Test
diff --git a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleContextTest.java b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleContextTest.java
index 52465e3..de47e1d 100644
--- a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleContextTest.java
+++ b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleContextTest.java
@@ -64,6 +64,7 @@
import net.starlark.java.eval.Mutability;
import net.starlark.java.eval.Sequence;
import net.starlark.java.eval.Starlark;
+import net.starlark.java.eval.StarlarkInt;
import net.starlark.java.eval.StarlarkList;
import org.junit.Before;
import org.junit.Test;
@@ -2614,7 +2615,7 @@
"BuildSettingInfo");
StructImpl buildSettingInfo = (StructImpl) buildSetting.get(key);
- assertThat(buildSettingInfo.getValue("value")).isEqualTo(24);
+ assertThat(buildSettingInfo.getValue("value")).isEqualTo(StarlarkInt.of(24));
}
@Test
@@ -2628,7 +2629,7 @@
"BuildSettingInfo");
StructImpl buildSettingInfo = (StructImpl) buildSetting.get(key);
- assertThat(buildSettingInfo.getValue("value")).isEqualTo(42);
+ assertThat(buildSettingInfo.getValue("value")).isEqualTo(StarlarkInt.of(42));
}
@Test
diff --git a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleImplementationFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleImplementationFunctionsTest.java
index aec46ba..f41a7c2 100644
--- a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleImplementationFunctionsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleImplementationFunctionsTest.java
@@ -74,6 +74,7 @@
import net.starlark.java.eval.Printer;
import net.starlark.java.eval.Sequence;
import net.starlark.java.eval.Starlark;
+import net.starlark.java.eval.StarlarkInt;
import net.starlark.java.eval.StarlarkList;
import net.starlark.java.eval.StarlarkThread;
import org.junit.Before;
@@ -1511,7 +1512,7 @@
.isEqualTo(
new StarlarkProvider.Key(
Label.parseAbsolute("//test:foo.bzl", ImmutableMap.of()), "foo_provider"));
- assertThat(((StructImpl) provider).getValue("a")).isEqualTo(123);
+ assertThat(((StructImpl) provider).getValue("a")).isEqualTo(StarlarkInt.of(123));
}
@Test
@@ -2311,15 +2312,15 @@
public void testArgsAddInvalidTypesForArgAndValues() throws Exception {
setRuleContext(createRuleContext("//foo:foo"));
ev.checkEvalErrorContains(
- "expected value of type 'string' for arg name, got 'Integer'",
+ "expected value of type 'string' for arg name, got 'int'",
"args = ruleContext.actions.args()",
"args.add(1, 'value')");
ev.checkEvalErrorContains(
- "expected value of type 'string' for arg name, got 'Integer'",
+ "expected value of type 'string' for arg name, got 'int'",
"args = ruleContext.actions.args()",
"args.add_all(1, [1, 2])");
ev.checkEvalErrorContains(
- "expected value of type 'sequence or depset' for values, got 'Integer'",
+ "expected value of type 'sequence or depset' for values, got 'int'",
"args = ruleContext.actions.args()",
"args.add_all(1)");
ev.checkEvalErrorContains(
@@ -2417,7 +2418,7 @@
CommandLineExpansionException e =
assertThrows(CommandLineExpansionException.class, () -> action.getArguments());
assertThat(e.getMessage())
- .contains("Expected map_each to return string, None, or list of strings, found Integer");
+ .contains("Expected map_each to return string, None, or list of strings, found int");
}
@Test
