From f6ff54b4b397a6ab9a31e39ac68bd85d011dbd0a Mon Sep 17 00:00:00 2001 From: Alessandro Patti Date: Sun, 21 Aug 2022 12:34:03 +0200 Subject: [PATCH] Dict --- .../java/com/google/devtools/build/lib/packages/Type.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/google/devtools/build/lib/packages/Type.java b/src/main/java/com/google/devtools/build/lib/packages/Type.java index ec42532b08a8e5..ca71c8ef734dd5 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/Type.java +++ b/src/main/java/com/google/devtools/build/lib/packages/Type.java @@ -34,6 +34,7 @@ import java.util.Set; import java.util.logging.Level; import javax.annotation.Nullable; +import net.starlark.java.eval.Dict; import net.starlark.java.eval.EvalException; import net.starlark.java.eval.Printer; import net.starlark.java.eval.Sequence; @@ -570,11 +571,11 @@ public Map convert(Object x, Object what, LabelConverter labelConv @Override public Map concat(Iterable> iterable) { - ImmutableMap.Builder output = new ImmutableMap.Builder<>(); + Dict.Builder output = new Dict.Builder<>(); for (Map map: iterable){ output.putAll(map); } - return output.buildKeepingLast(); + return output.buildImmutable(); } @Override