Flip the flag --incompatible_disallow_dict_lookup_unhashable_keys

Fixes #9184 RELNOTES: incompatible_disallow_dict_lookup_unhashable_keys is enabled by default #9184 PiperOrigin-RevId: 280659890
bazelbuild · Nov 15, 2019 · b31d832 · b31d832
1 parent bea9d25
commit b31d832
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java b/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
@@ -306,7 +306,7 @@ public class StarlarkSemanticsOptions extends OptionsBase implements Serializabl
 
   @Option(
       name = "incompatible_disallow_dict_lookup_unhashable_keys",
-      defaultValue = "false",
+      defaultValue = "true",
       documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
       effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
       metadataTags = {

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java b/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
@@ -284,6 +284,7 @@ public static Builder builderWithDefaults() {
           .incompatibleRestrictStringEscapes(false)
           .incompatibleDisallowDictLookupUnhashableKeys(false)
           .incompatibleUseCcConfigureFromRulesCc(false)
+          .incompatibleDisallowDictLookupUnhashableKeys(true)
           .build();
 
   /** Builder for {@link StarlarkSemantics}. All fields are mandatory. */

diff --git a/src/test/starlark/testdata/dict.sky b/src/test/starlark/testdata/dict.sky
@@ -91,17 +91,16 @@ assert_eq(() in {}, False)
 assert_eq("a" in dict(a=1), True)
 ---
 
-# should fail after --incompatible_disallow_dict_lookup_unhashable_keys is flipped to true
 # unhashable types
 
-{} in {} ## unhashable type: 'dict'
+{} in {} ### unhashable type: 'dict'
 ---
-[] in {} ## unhashable type: 'list'
+[] in {} ### unhashable type: 'list'
 ---
-len in {} ## unhashable type: 'function'
+len in {} ### unhashable type: 'function'
 ---
-{}.get([]) ## unhashable type: 'list'
+{}.get([]) ### unhashable type: 'list'
 ---
-dict().get({}) ## unhashable type: 'dict'
+dict().get({}) ### unhashable type: 'dict'
 ---
-{1: 2}.get(len) ## unhashable type: 'function'
+{1: 2}.get(len) ### unhashable type: 'function'