diff options
| author |  jcater <jcater@google.com> | 2017-07-05 22:14:10 -0400 |
|---|---|---|
| committer | John Cater <jcater@google.com> | 2017-07-06 07:14:13 -0400 |
| commit | 384df17b895a360027d8f2be18fdf92af3842016 (patch) | |
| tree | 7bb23f27817ae92ed563ae233e390fbb30cf083d /src/main/java/com/google/devtools/build | |
| parent | 478f763599828f88724ee8b3e59f38539cbdd73d (diff) | |
Fix SkylarkDict.castSkylarkDictOrNoneToDict to return a Map.
PiperOrigin-RevId: 161034828
Diffstat (limited to 'src/main/java/com/google/devtools/build')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/platform/ToolchainInfo.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/syntax/SkylarkDict.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/platform/ToolchainInfo.java b/src/main/java/com/google/devtools/build/lib/analysis/platform/ToolchainInfo.java index f5f8cc858d..0a3c6a4639 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/platform/ToolchainInfo.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/platform/ToolchainInfo.java @@ -67,7 +67,7 @@ public class ToolchainInfo extends SkylarkClassObject { throws EvalException { // Based on SIGNATURE above, the args are label, map. Label type = (Label) args[0]; - SkylarkDict<String, Object> data = + Map<String, Object> data = SkylarkDict.castSkylarkDictOrNoneToDict(args[1], String.class, Object.class, "data"); return ToolchainInfo.create(type, data, loc); } diff --git a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkDict.java b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkDict.java index bfb7dca9cb..bdcf336777 100644 --- a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkDict.java +++ b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkDict.java @@ -181,7 +181,7 @@ public final class SkylarkDict<K, V> extends MutableMap<K, V> * @param valueType the expected class of values * @param description a description of the argument being converted, or null, for debugging */ - public static <K, V> SkylarkDict<K, V> castSkylarkDictOrNoneToDict( + public static <K, V> Map<K, V> castSkylarkDictOrNoneToDict( Object obj, Class<K> keyType, Class<V> valueType, @Nullable String description) throws EvalException { if (EvalUtils.isNullOrNone(obj)) { |