| commit | b6422285198f0a8851867ded469ee01ea51b8656 | [log] [tgz] |
|---|---|---|
| author | laurentlb <laurentlb@google.com> | Wed Feb 20 11:03:01 2019 -0800 |
| committer | Copybara-Service <copybara-worker@google.com> | Wed Feb 20 11:05:12 2019 -0800 |
| tree | 3b75079f41d80b7a844878c76673b3dda96813dd | |
| parent | e73fefaead38f4b063f43d2f7364b400203ee860 [diff] |
Enable --incompatible_disallow_dict_plus by default Fixes #6461 RELNOTES: --incompatible_disallow_dict_plus is enabled by default PiperOrigin-RevId: 234829823
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 index 231480a..78b70e6 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java +++ b/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
@@ -258,7 +258,7 @@ @Option( name = "incompatible_disallow_dict_plus", - 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 index f075118..fd40dd5 100644 --- a/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java +++ b/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
@@ -218,7 +218,7 @@ .incompatibleDisableDeprecatedAttrParams(false) .incompatibleDisableObjcProviderResources(false) .incompatibleDisallowDataTransition(true) - .incompatibleDisallowDictPlus(false) + .incompatibleDisallowDictPlus(true) .incompatibleDisallowFileType(true) .incompatibleDisallowLegacyJavaProvider(false) .incompatibleDisallowLegacyJavaInfo(false)