Rename incompatible_disable_depset_inputs to incompatible_disable_depset_items
The only flag that exists is --incompatible_disable_depset_items. Confusion of names was introduced in https://github.com/bazelbuild/bazel/commit/f0cf2b4a56831245f88eb56c508af35a62e78b20, likely caused by an incomplete renaming.
The only user-visible effect is in the error messages, that are now fixed.
RELNOTES: None.
PiperOrigin-RevId: 319016789
diff --git a/src/main/java/com/google/devtools/build/lib/collect/nestedset/Depset.java b/src/main/java/com/google/devtools/build/lib/collect/nestedset/Depset.java
index 6cd16d0..c7bd033 100644
--- a/src/main/java/com/google/devtools/build/lib/collect/nestedset/Depset.java
+++ b/src/main/java/com/google/devtools/build/lib/collect/nestedset/Depset.java
@@ -529,7 +529,7 @@
null,
"parameter 'direct' must contain a list of elements, and may no longer accept a"
+ " depset. The deprecated behavior may be temporarily re-enabled by setting"
- + " --incompatible_disable_depset_inputs=false");
+ + " --incompatible_disable_depset_items=false");
}
result =
fromDirectAndTransitive(
diff --git a/src/main/java/com/google/devtools/build/lib/packages/StarlarkLibrary.java b/src/main/java/com/google/devtools/build/lib/packages/StarlarkLibrary.java
index 0824d3b..d5a9117 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/StarlarkLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/StarlarkLibrary.java
@@ -108,10 +108,10 @@
doc =
"A positional parameter distinct from other parameters for legacy support. "
+ "\n" //
- + "<p>If <code>--incompatible_disable_depset_inputs</code> is false, this "
+ + "<p>If <code>--incompatible_disable_depset_items</code> is false, this "
+ "parameter serves as the value of <code>items</code>.</p> "
+ "\n" //
- + "<p>If <code>--incompatible_disable_depset_inputs</code> is true, this "
+ + "<p>If <code>--incompatible_disable_depset_items</code> is true, this "
+ "parameter serves as the value of <code>direct</code>.</p> "
+ "\n" //
+ "<p>See the documentation for these parameters for more details."),
@@ -151,7 +151,7 @@
+ "the new depset, in left-to-right order, or else a depset that becomes "
+ "a transitive element of the new depset. In the latter case, "
+ "<code>transitive</code> cannot be specified.",
- disableWithFlag = StarlarkSemantics.FlagIdentifier.INCOMPATIBLE_DISABLE_DEPSET_INPUTS,
+ disableWithFlag = StarlarkSemantics.FlagIdentifier.INCOMPATIBLE_DISABLE_DEPSET_ITEMS,
valueWhenDisabled = "[]",
named = true),
},
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 ee69211..7a9feab 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
@@ -92,8 +92,8 @@
public static final String EXPERIMENTAL_EXEC_GROUPS = "experimental_exec_groups";
public static final String INCOMPATIBLE_APPLICABLE_LICENSES =
"incompatible_applicable_licenses";
- public static final String INCOMPATIBLE_DISABLE_DEPSET_INPUTS =
- "incompatible_disable_depset_inputs";
+ public static final String INCOMPATIBLE_DISABLE_DEPSET_ITEMS =
+ "incompatible_disable_depset_items";
public static final String INCOMPATIBLE_NO_RULE_OUTPUTS_PARAM =
"incompatible_no_rule_outputs_param";
public static final String INCOMPATIBLE_NO_ATTR_LICENSE = "incompatible_no_attr_license";
@@ -141,7 +141,7 @@
return experimentalExecGroups();
case FlagIdentifier.INCOMPATIBLE_APPLICABLE_LICENSES:
return incompatibleApplicableLicenses();
- case FlagIdentifier.INCOMPATIBLE_DISABLE_DEPSET_INPUTS:
+ case FlagIdentifier.INCOMPATIBLE_DISABLE_DEPSET_ITEMS:
return incompatibleDisableDepsetItems();
case FlagIdentifier.INCOMPATIBLE_NO_RULE_OUTPUTS_PARAM:
return incompatibleNoRuleOutputsParam();
diff --git a/src/test/java/com/google/devtools/build/lib/collect/nestedset/DepsetTest.java b/src/test/java/com/google/devtools/build/lib/collect/nestedset/DepsetTest.java
index 3f66420..873ed99 100644
--- a/src/test/java/com/google/devtools/build/lib/collect/nestedset/DepsetTest.java
+++ b/src/test/java/com/google/devtools/build/lib/collect/nestedset/DepsetTest.java
@@ -511,7 +511,7 @@
.testIfErrorContains(
"in call to depset(), parameter 'items' is deprecated and will be removed soon. "
+ "It may be temporarily re-enabled by setting "
- + "--incompatible_disable_depset_inputs=false",
+ + "--incompatible_disable_depset_items=false",
"depset(items=[0,1])");
}
}
