Set the default value of `incompatible_disallow_conflicting_providers…

…` to true Fixes #5902 RELNOTES: `--incompatible_disallow_conflicting_providers` has been switched to true PiperOrigin-RevId: 219143417
bazelbuild · Oct 29, 2018 · 8ef1e6b · 8ef1e6b
1 parent 9df9e5a
commit 8ef1e6b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/site/docs/skylark/backward-compatibility.md b/site/docs/skylark/backward-compatibility.md
@@ -53,6 +53,7 @@ Starlark Rules
 *   [Expand directories in Args](#expand-directories-in-args)
 *   [Disable late bound option defaults](#disable-late-bound-option-defaults)
 *   [Disallow `cfg = "data"`](#disallow-cfg-data)
+*   [Disallow conflicting providers](#disallow-conflicting-providers)
 
 Objc
 
@@ -999,6 +1000,17 @@ fail with an error.
 *   Tracking issue: [#6153](https://github.com/bazelbuild/bazel/issues/6153)
 
 
+### Disallow conflicting providers
+
+If set to true, disallow rule implementation functions from returning multiple
+instances of the same type of provider. If false, only the last in the list will
+be used.
+
+*   Flag: `incompatible_disallow_conflicting_providers`
+*   Default: `true`
+*   Tracking issue: [#5902](https://github.com/bazelbuild/bazel/issues/5902)
+
+
 ### Load label cannot cross package boundaries
 
 Previously, the label argument to the `load` statement (the first argument) was

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
@@ -205,7 +205,7 @@ public class SkylarkSemanticsOptions extends OptionsBase implements Serializable
 
   @Option(
       name = "incompatible_disallow_conflicting_providers",
-      defaultValue = "false",
+      defaultValue = "true",
       documentationCategory = OptionDocumentationCategory.SKYLARK_SEMANTICS,
       effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
       metadataTags = {

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
@@ -204,7 +204,7 @@ public static Builder builderWithDefaults() {
           .incompatibleDepsetUnion(false)
           .incompatibleDisableDeprecatedAttrParams(false)
           .incompatibleDisableObjcProviderResources(false)
-          .incompatibleDisallowConflictingProviders(false)
+          .incompatibleDisallowConflictingProviders(true)
           .incompatibleDisallowDataTransition(false)
           .incompatibleDisallowDictPlus(false)
           .incompatibleDisallowFileType(false)