aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar vladmos <vladmos@google.com>2017-10-13 19:16:10 +0200
committerGravatar Jakob Buchgraber <buchgr@google.com>2017-10-16 17:48:33 +0200
commit08214c180a8971711b7ff344bb5874a6fcafe252 (patch)
treef52166bbe255a292ec9ae0c07cbb277f822bc058
parent87b22a140ed829a2da68b588b50fa981c4e456b7 (diff)
Flip the --incompatible_list_plus_equals_inplace flag by default
RELNOTES[INC]: += on lists now mutates them. `list1 += list2` is now equivalent to `list1.extend(list2)` and not equivalent to `list1 = list1 + list2` anymore. Fixes #2350. PiperOrigin-RevId: 172111899
-rw-r--r--site/docs/skylark/backward-compatibility.md2
-rw-r--r--src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsOptions.java2
-rw-r--r--src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java2
3 files changed, 3 insertions, 3 deletions
diff --git a/site/docs/skylark/backward-compatibility.md b/site/docs/skylark/backward-compatibility.md
index 8fcd3f8608..cb9991040d 100644
--- a/site/docs/skylark/backward-compatibility.md
+++ b/site/docs/skylark/backward-compatibility.md
@@ -87,7 +87,7 @@ This change makes Skylark more compatible with Python and avoids performance
issues. The `+=` operator for tuples is unaffected.
* Flag: `--incompatible_list_plus_equals_inplace`
-* Default: `false`
+* Default: `true`
### Dictionary concatenation
diff --git a/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsOptions.java b/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsOptions.java
index cfa13646f1..0f8e0c4ad2 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsOptions.java
@@ -160,7 +160,7 @@ public class SkylarkSemanticsOptions extends OptionsBase implements Serializable
@Option(
name = "incompatible_list_plus_equals_inplace",
- defaultValue = "false",
+ defaultValue = "true",
category = "incompatible changes",
documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
effectTags = {OptionEffectTag.UNKNOWN},
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java
index 8fdfaf5cd1..105768fd3d 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemantics.java
@@ -68,7 +68,7 @@ public abstract class SkylarkSemantics {
.incompatibleDisallowDictPlus(false)
.incompatibleDisallowKeywordOnlyArgs(true)
.incompatibleDisallowToplevelIfStatement(true)
- .incompatibleListPlusEqualsInplace(false)
+ .incompatibleListPlusEqualsInplace(true)
.incompatibleLoadArgumentIsLabel(false)
.incompatibleNewActionsApi(false)
.incompatibleStringIsNotIterable(false)