diff options
| author |  laurentlb <laurentlb@google.com> | 2017-12-07 10:38:46 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2017-12-07 10:43:38 -0800 |
| commit | 2bbda4aadc78f7e6b48ebf68475ca8076fd8a989 (patch) | |
| tree | 9240ae10466c7ce197724d72d84498e489293c7a /src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsCodec.java | |
| parent | 74d894a2d9b73cb029c0315ce33013e548ce0f3d (diff) | |
New flag `--incompatible_depset_union` to disable old-style depset merging.
RELNOTES:
Using `+`, `|` or `.union` on depsets is now deprecated. Please use the new
constructor instead (see https://docs.bazel.build/versions/master/skylark/depsets.html).
PiperOrigin-RevId: 178262338
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsCodec.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsCodec.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsCodec.java b/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsCodec.java index 1edc800c2b..0c0ece9971 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsCodec.java +++ b/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsCodec.java @@ -44,6 +44,7 @@ public final class SkylarkSemanticsCodec implements ObjectCodec<SkylarkSemantics codedOut.writeBoolNoTag(semantics.incompatibleCheckedArithmetic()); codedOut.writeBoolNoTag(semantics.incompatibleComprehensionVariablesDoNotLeak()); codedOut.writeBoolNoTag(semantics.incompatibleDepsetIsNotIterable()); + codedOut.writeBoolNoTag(semantics.incompatibleDepsetUnion()); codedOut.writeBoolNoTag(semantics.incompatibleDictLiteralHasNoDuplicates()); codedOut.writeBoolNoTag(semantics.incompatibleDisallowDictPlus()); codedOut.writeBoolNoTag(semantics.incompatibleDisallowKeywordOnlyArgs()); @@ -68,6 +69,7 @@ public final class SkylarkSemanticsCodec implements ObjectCodec<SkylarkSemantics builder.incompatibleCheckedArithmetic(codedIn.readBool()); builder.incompatibleComprehensionVariablesDoNotLeak(codedIn.readBool()); builder.incompatibleDepsetIsNotIterable(codedIn.readBool()); + builder.incompatibleDepsetUnion(codedIn.readBool()); builder.incompatibleDictLiteralHasNoDuplicates(codedIn.readBool()); builder.incompatibleDisallowDictPlus(codedIn.readBool()); builder.incompatibleDisallowKeywordOnlyArgs(codedIn.readBool()); |