diff options
Diffstat (limited to 'src/main/java/com/google/devtools')
| -rw-r--r-- | src/main/java/com/google/devtools/common/options/IsolatedOptionsData.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/common/options/OptionsParserImpl.java | 8 |
2 files changed, 0 insertions, 10 deletions
diff --git a/src/main/java/com/google/devtools/common/options/IsolatedOptionsData.java b/src/main/java/com/google/devtools/common/options/IsolatedOptionsData.java index 81820c47d9..c68dad087d 100644 --- a/src/main/java/com/google/devtools/common/options/IsolatedOptionsData.java +++ b/src/main/java/com/google/devtools/common/options/IsolatedOptionsData.java @@ -354,11 +354,9 @@ public class IsolatedOptionsData extends OpaqueOptionsData { Map<String, String> booleanAliasMap, String optionName) { // Check that the negating alias does not conflict with existing flags. - checkForCollisions(nameToFieldMap, "no_" + optionName, "boolean option alias"); checkForCollisions(nameToFieldMap, "no" + optionName, "boolean option alias"); // Record that the boolean option takes up additional namespace for its negating alias. - booleanAliasMap.put("no_" + optionName, optionName); booleanAliasMap.put("no" + optionName, optionName); } diff --git a/src/main/java/com/google/devtools/common/options/OptionsParserImpl.java b/src/main/java/com/google/devtools/common/options/OptionsParserImpl.java index a4d905a547..f80f1baf11 100644 --- a/src/main/java/com/google/devtools/common/options/OptionsParserImpl.java +++ b/src/main/java/com/google/devtools/common/options/OptionsParserImpl.java @@ -619,15 +619,7 @@ class OptionsParserImpl { // Look for a "no"-prefixed option name: "no<optionName>". if (field == null && name.startsWith("no")) { - // Give a nice error if someone is using the deprecated --no_ prefix. - // TODO(Bazel-team): Remove the --no_ check when sufficient time has passed for users of - // that feature to have stopped using it. name = name.substring(2); - if (name.startsWith("_") && optionsData.getFieldFromName(name.substring(1)) != null) { - name = name.substring(1); - warnings.add("Option '" + name + "' is specified using the deprecated --no_ prefix. " - + "Use --no without the underscore instead."); - } field = optionsData.getFieldFromName(name); booleanValue = false; if (field != null) { |