diff options
author | ccalvarin <ccalvarin@google.com> | 2017-07-11 14:23:46 +0200 |
---|---|---|
committer | László Csomor <laszlocsomor@google.com> | 2017-07-11 14:47:53 +0200 |
commit | 456adb2267343a4e2e64f082e77169c18f9e6060 (patch) | |
tree | b63794930df06ad9afc910ca16784cf4bab812f9 /src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemanticsOptions.java | |
parent | 75483b58d047c3a4e26e098823dc3b77644c3c11 (diff) |
Fold OptionUsageRestrictions into OptionDocumentationCategory and OptionMetadataTags.
These are similar, no need to have both fields. Removing the "DOCUMENTED" default, the absence of UNDOCUMENTED will be used instead.
Since requiring a documentation category for undocumented options doesn't make sense, list that as one of the OptionDocumentationCategories, but list HIDDEN and INTERNAL as part of OptionMetadata. These options should list UNDOCUMENTED as their category.
PiperOrigin-RevId: 161515674
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemanticsOptions.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemanticsOptions.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemanticsOptions.java b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemanticsOptions.java index d77fda83e1..b73b0a4cea 100644 --- a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemanticsOptions.java +++ b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkSemanticsOptions.java @@ -17,7 +17,6 @@ package com.google.devtools.build.lib.syntax; import com.google.devtools.common.options.Option; import com.google.devtools.common.options.OptionDocumentationCategory; import com.google.devtools.common.options.OptionsBase; -import com.google.devtools.common.options.OptionsParser.OptionUsageRestrictions; import com.google.devtools.common.options.UsesOnlyCoreTypes; import com.google.devtools.common.options.proto.OptionFilters.OptionEffectTag; import com.google.devtools.common.options.proto.OptionFilters.OptionMetadataTag; @@ -42,9 +41,8 @@ public class SkylarkSemanticsOptions extends OptionsBase implements Serializable @Option( name = "internal_skylark_flag_test_canary", defaultValue = "false", - documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, - effectTags = {OptionEffectTag.UNKNOWN}, - optionUsageRestrictions = OptionUsageRestrictions.UNDOCUMENTED + documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, + effectTags = {OptionEffectTag.UNKNOWN} ) public boolean skylarkFlagTestCanary; @@ -200,10 +198,9 @@ public class SkylarkSemanticsOptions extends OptionsBase implements Serializable name = "incompatible_descriptive_string_representations", defaultValue = "false", category = "incompatible changes", - documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, + documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.UNKNOWN}, metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, - optionUsageRestrictions = OptionUsageRestrictions.UNDOCUMENTED, help = "If set to true, objects are converted to strings by `str` and `repr` functions using the " + "new style representations that are designed to be more descriptive and not to leak " |