Remove the type data from ToolchainInfo, it is reduntant with DeclaredToolchainInfo.

Fixes #3458.

Change-Id: I24dd6d9d24432b9aaf0229de658f07e465ad63cb
PiperOrigin-RevId: 163466882

3 files changed, 0 insertions, 16 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/platform/ToolchainInfoTest.java b/src/test/java/com/google/devtools/build/lib/analysis/platform/ToolchainInfoTest.java
index b37ee76666..d642994955 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/platform/ToolchainInfoTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/platform/ToolchainInfoTest.java
@@ -35,7 +35,6 @@ public class ToolchainInfoTest extends BuildViewTestCase {
         "test/toolchain/my_toolchain.bzl",
         "def _impl(ctx):",
         "  toolchain = platform_common.ToolchainInfo(",
-        "      type = Label('//test/toolchain:my_toolchain_type'),",
         "      extra_label = ctx.attr.extra_label,",
         "      extra_str = ctx.attr.extra_str)",
         "  return [toolchain]",
@@ -61,8 +60,6 @@ public class ToolchainInfoTest extends BuildViewTestCase {
     ToolchainInfo provider = PlatformProviderUtils.toolchain(toolchain);
     assertThat(provider).isNotNull();
 
-    assertThat(provider.type()).isEqualTo(makeLabel("//test/toolchain:my_toolchain_type"));
-
     ConfiguredTarget extraLabel = (ConfiguredTarget) provider.getValue("extra_label");
     assertThat(extraLabel).isNotNull();
     assertThat(extraLabel.getLabel()).isEqualTo(makeLabel("//test/toolchain:dep"));
@@ -75,23 +72,14 @@ public class ToolchainInfoTest extends BuildViewTestCase {
         .addEqualityGroup(
             // Base case.
             ToolchainInfo.create(
-                makeLabel("//toolchain:tc1"),
                 ImmutableMap.<String, Object>of("foo", "val1", "bar", "val2"),
                 Location.BUILTIN),
             ToolchainInfo.create(
-                makeLabel("//toolchain:tc1"),
-                ImmutableMap.<String, Object>of("foo", "val1", "bar", "val2"),
-                Location.BUILTIN))
-        .addEqualityGroup(
-            // Different type.
-            ToolchainInfo.create(
-                makeLabel("//toolchain:tc2"),
                 ImmutableMap.<String, Object>of("foo", "val1", "bar", "val2"),
                 Location.BUILTIN))
         .addEqualityGroup(
             // Different data.
             ToolchainInfo.create(
-                makeLabel("//toolchain:tc1"),
                 ImmutableMap.<String, Object>of("foo", "val1", "bar", "val3"),
                 Location.BUILTIN))
         .testEquals();
diff --git a/src/test/java/com/google/devtools/build/lib/rules/platform/ToolchainTest.java b/src/test/java/com/google/devtools/build/lib/rules/platform/ToolchainTest.java
index e00314b84e..c58af1f069 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/platform/ToolchainTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/platform/ToolchainTest.java
@@ -48,15 +48,12 @@ public class ToolchainTest extends BuildViewTestCase {
     scratch.file(
         "toolchain/toolchain_def.bzl",
         "def _impl(ctx):",
-        "  toolchain_type = ctx.attr._toolchain_type[platform_common.ToolchainTypeInfo]",
         "  toolchain = platform_common.ToolchainInfo(",
-        "      type = toolchain_type,",
         "      data = ctx.attr.data)",
         "  return [toolchain]",
         "toolchain_def = rule(",
         "    implementation = _impl,",
         "    attrs = {",
-        "        '_toolchain_type': attr.label(default = Label('//toolchain:demo_toolchain')),",
         "       'data': attr.string()})");
     scratch.file(
         "toolchain/BUILD",
diff --git a/src/test/java/com/google/devtools/build/lib/rules/platform/ToolchainTestCase.java b/src/test/java/com/google/devtools/build/lib/rules/platform/ToolchainTestCase.java
index 3b9548d9a6..bea2f5f227 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/platform/ToolchainTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/platform/ToolchainTestCase.java
@@ -89,7 +89,6 @@ public abstract class ToolchainTestCase extends SkylarkTestCase {
         "toolchain/toolchain_def.bzl",
         "def _impl(ctx):",
         "  toolchain = platform_common.ToolchainInfo(",
-        "      type = Label('//toolchain:test_toolchain'),",
         "      data = ctx.attr.data)",
         "  return [toolchain]",
         "test_toolchain = rule(",