diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib')
4 files changed, 0 insertions, 32 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/packages/AttributeFormatter.java b/src/main/java/com/google/devtools/build/lib/packages/AttributeFormatter.java index 4a1c283a3a..f14ca5db7d 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/AttributeFormatter.java +++ b/src/main/java/com/google/devtools/build/lib/packages/AttributeFormatter.java @@ -30,7 +30,6 @@ import static com.google.devtools.build.lib.syntax.Type.INTEGER; import static com.google.devtools.build.lib.syntax.Type.INTEGER_LIST; import static com.google.devtools.build.lib.syntax.Type.STRING; import static com.google.devtools.build.lib.syntax.Type.STRING_DICT; -import static com.google.devtools.build.lib.syntax.Type.STRING_DICT_UNARY; import static com.google.devtools.build.lib.syntax.Type.STRING_LIST; import static com.google.devtools.build.lib.syntax.Type.STRING_LIST_DICT; @@ -49,7 +48,6 @@ import com.google.devtools.build.lib.query2.proto.proto2api.Build.LabelDictUnary import com.google.devtools.build.lib.query2.proto.proto2api.Build.LabelKeyedStringDictEntry; import com.google.devtools.build.lib.query2.proto.proto2api.Build.LabelListDictEntry; import com.google.devtools.build.lib.query2.proto.proto2api.Build.StringDictEntry; -import com.google.devtools.build.lib.query2.proto.proto2api.Build.StringDictUnaryEntry; import com.google.devtools.build.lib.query2.proto.proto2api.Build.StringListDictEntry; import com.google.devtools.build.lib.syntax.Type; import java.util.Collection; @@ -212,15 +210,6 @@ public class AttributeFormatter { .setValue(keyValueList.getValue()); builder.addStringDictValue(entry); } - } else if (type == STRING_DICT_UNARY) { - Map<String, String> dict = (Map<String, String>) value; - for (Map.Entry<String, String> dictEntry : dict.entrySet()) { - StringDictUnaryEntry.Builder entry = - StringDictUnaryEntry.newBuilder() - .setKey(dictEntry.getKey()) - .setValue(dictEntry.getValue()); - builder.addStringDictUnaryValue(entry); - } } else if (type == STRING_LIST_DICT) { Map<String, List<String>> dict = (Map<String, List<String>>) value; for (Map.Entry<String, List<String>> dictEntry : dict.entrySet()) { @@ -327,8 +316,6 @@ public class AttributeFormatter { void addIntListValue(int i); - void addStringDictUnaryValue(StringDictUnaryEntry.Builder builder); - void addStringDictValue(StringDictEntry.Builder builder); void addStringListDictValue(StringListDictEntry.Builder builder); @@ -398,11 +385,6 @@ public class AttributeFormatter { } @Override - public void addStringDictUnaryValue(StringDictUnaryEntry.Builder builder) { - attributeBuilder.addStringDictUnaryValue(builder); - } - - @Override public void addStringDictValue(StringDictEntry.Builder builder) { attributeBuilder.addStringDictValue(builder); } @@ -529,11 +511,6 @@ public class AttributeFormatter { } @Override - public void addStringDictUnaryValue(StringDictUnaryEntry.Builder builder) { - selectorEntryBuilder.addStringDictUnaryValue(builder); - } - - @Override public void addStringDictValue(StringDictEntry.Builder builder) { selectorEntryBuilder.addStringDictValue(builder); } diff --git a/src/main/java/com/google/devtools/build/lib/packages/ProtoUtils.java b/src/main/java/com/google/devtools/build/lib/packages/ProtoUtils.java index 7c0335d406..29d56c6983 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/ProtoUtils.java +++ b/src/main/java/com/google/devtools/build/lib/packages/ProtoUtils.java @@ -31,7 +31,6 @@ import static com.google.devtools.build.lib.syntax.Type.INTEGER; import static com.google.devtools.build.lib.syntax.Type.INTEGER_LIST; import static com.google.devtools.build.lib.syntax.Type.STRING; import static com.google.devtools.build.lib.syntax.Type.STRING_DICT; -import static com.google.devtools.build.lib.syntax.Type.STRING_DICT_UNARY; import static com.google.devtools.build.lib.syntax.Type.STRING_LIST; import static com.google.devtools.build.lib.syntax.Type.STRING_LIST_DICT; @@ -68,7 +67,6 @@ public class ProtoUtils { .put(BOOLEAN, Discriminator.BOOLEAN) .put(TRISTATE, Discriminator.TRISTATE) .put(INTEGER_LIST, Discriminator.INTEGER_LIST) - .put(STRING_DICT_UNARY, Discriminator.STRING_DICT_UNARY) .put(LABEL_KEYED_STRING_DICT, Discriminator.LABEL_KEYED_STRING_DICT) .build(); diff --git a/src/main/java/com/google/devtools/build/lib/query2/output/ProtoOutputFormatter.java b/src/main/java/com/google/devtools/build/lib/query2/output/ProtoOutputFormatter.java index f966afb88d..66fd324743 100644 --- a/src/main/java/com/google/devtools/build/lib/query2/output/ProtoOutputFormatter.java +++ b/src/main/java/com/google/devtools/build/lib/query2/output/ProtoOutputFormatter.java @@ -432,7 +432,6 @@ public class ProtoOutputFormatter extends AbstractUnorderedFormatter { // Same for maps as for collections. if (attrType == Type.STRING_DICT - || attrType == Type.STRING_DICT_UNARY || attrType == Type.STRING_LIST_DICT || attrType == BuildType.LABEL_DICT_UNARY || attrType == BuildType.LABEL_KEYED_STRING_DICT) { diff --git a/src/main/java/com/google/devtools/build/lib/syntax/Type.java b/src/main/java/com/google/devtools/build/lib/syntax/Type.java index fc89927c42..6a0a76b4bf 100644 --- a/src/main/java/com/google/devtools/build/lib/syntax/Type.java +++ b/src/main/java/com/google/devtools/build/lib/syntax/Type.java @@ -229,12 +229,6 @@ public abstract class Type<T> { DictType.create(STRING, STRING_LIST); /** - * The type of a dictionary of {@linkplain #STRING strings}, where each entry - * maps to a single string value. - */ - public static final DictType<String, String> STRING_DICT_UNARY = DictType.create(STRING, STRING); - - /** * For ListType objects, returns the type of the elements of the list; for * all other types, returns null. (This non-obvious implementation strategy * is necessitated by the wildcard capture rules of the Java type system, |