Rename ToolchainLookup rule to ToolchainType, to better explain the usage of

the rule.

Example:
tools/newlang/BUILD:
  toolchain_type(name = "toolchain_type")
Allows users to refer to //tools/newlang:toolchain_type when discussing the
newlang toolchain.

The previous usage:
tools/newlang/BUILD:
  toolchain_lookup(name = "lookup")
Lead to labels like //tools/newlang:lookup, which was unclear that each
language's toolchain needs one unique instance of toolchain_(lookup|type).

--
PiperOrigin-RevId: 151326827
MOS_MIGRATED_REVID=151326827

4 files changed, 16 insertions, 16 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java b/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java
index 9eb703cf99..fdb8792819 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java
@@ -77,7 +77,7 @@ public final class BazelMockCcSupport extends MockCcSupport {
     config.create(
         "/bazel_tools_workspace/tools/cpp/BUILD",
         "package(default_visibility=['//visibility:public'])",
-        "toolchain_lookup(name = 'lookup')",
+        "toolchain_type(name = 'toolchain_type')",
         "cc_library(name = 'stl')",
         "cc_library(name = 'malloc')",
         "cc_toolchain_suite(",
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java b/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java
index 80dceea4d2..e2d13a00ac 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java
@@ -563,7 +563,7 @@ public abstract class MockCcSupport {
     config.create(
         "tools/cpp/BUILD",
         "package(default_visibility = ['//visibility:public'])",
-        "toolchain_lookup(name = 'lookup')",
+        "toolchain_type(name = 'toolchain_type')",
         "cc_library(name = 'stl')",
         "alias(name='toolchain', actual='//third_party/crosstool')",
         "cc_library(name = 'malloc')",
diff --git a/src/test/java/com/google/devtools/build/lib/rules/ToolchainLookupTest.java b/src/test/java/com/google/devtools/build/lib/rules/ToolchainTypeTest.java
index 54a8d584e7..ce939a8abb 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/ToolchainLookupTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/ToolchainTypeTest.java
@@ -20,13 +20,13 @@ import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
 import org.junit.Test;
 
 /**
- * Unit tests for the {@code toolchain_lookup} rule.
+ * Unit tests for the {@code toolchain_type} rule.
  */
-public class ToolchainLookupTest extends BuildViewTestCase {
+public class ToolchainTypeTest extends BuildViewTestCase {
   @Test
   public void testSmoke() throws Exception {
     ConfiguredTarget cc = getConfiguredTarget(getRuleClassProvider().getToolsRepository()
-        + "//tools/cpp:lookup");
+        + "//tools/cpp:toolchain_type");
     assertThat(cc.getProvider(ToolchainProvider.class).getMakeVariables())
         .containsKey("TARGET_CPU");
   }
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java
index ca41179bc9..75b91c3c54 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java
@@ -39,13 +39,13 @@ import com.google.devtools.build.lib.analysis.mock.BazelAnalysisMock;
 import com.google.devtools.build.lib.analysis.util.AnalysisMock;
 import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
 import com.google.devtools.build.lib.bazel.rules.BazelRuleClassProvider;
-import com.google.devtools.build.lib.bazel.rules.BazelToolchainLookup;
+import com.google.devtools.build.lib.bazel.rules.BazelToolchainType;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.cmdline.PackageIdentifier;
 import com.google.devtools.build.lib.cmdline.RepositoryName;
 import com.google.devtools.build.lib.flags.InvocationPolicyEnforcer;
 import com.google.devtools.build.lib.packages.RuleClass;
-import com.google.devtools.build.lib.rules.ToolchainLookup;
+import com.google.devtools.build.lib.rules.ToolchainType;
 import com.google.devtools.build.lib.testutil.MoreAsserts;
 import com.google.devtools.build.lib.util.FileType;
 import com.google.devtools.build.lib.util.OsUtils;
@@ -905,10 +905,10 @@ public class CcCommonTest extends BuildViewTestCase {
   }
 
   /**
-   * A {@code toolchain_lookup} rule for testing that only supports C++.
+   * A {@code toolchain_type} rule for testing that only supports C++.
    */
-  public static class OnlyCppToolchainLookup extends ToolchainLookup {
-    public OnlyCppToolchainLookup() {
+  public static class OnlyCppToolchainType extends ToolchainType {
+    public OnlyCppToolchainType() {
       super(
           ImmutableMap.<Label, Class<? extends BuildConfiguration.Fragment>>of(),
           ImmutableMap.<Label, ImmutableMap<String, String>>of());
@@ -916,13 +916,13 @@ public class CcCommonTest extends BuildViewTestCase {
   }
 
   /**
-   * A {@code toolchain_lookup} rule for testing that only supports C++.
+   * A {@code toolchain_type} rule for testing that only supports C++.
    */
-  public static class OnlyCppToolchainLookupRule implements RuleDefinition {
+  public static class OnlyCppToolchainTypeRule implements RuleDefinition {
     @Override
     public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment environment) {
       return builder
-          // This means that *every* toolchain_lookup rule depends on every configuration fragment
+          // This means that *every* toolchain_type rule depends on every configuration fragment
           // that contributes Make variables, regardless of which one it is.
           .requiresConfigurationFragments(CppConfiguration.class)
           .removeAttribute("licenses")
@@ -933,8 +933,8 @@ public class CcCommonTest extends BuildViewTestCase {
     @Override
     public Metadata getMetadata() {
       return Metadata.builder()
-          .name("toolchain_lookup")
-          .factoryClass(BazelToolchainLookup.class)
+          .name("toolchain_type")
+          .factoryClass(BazelToolchainType.class)
           .ancestors(BaseRuleClasses.BaseRule.class)
           .build();
     }
@@ -966,7 +966,7 @@ public class CcCommonTest extends BuildViewTestCase {
           BazelRuleClassProvider.CORE_WORKSPACE_RULES.init(builder);
           BazelRuleClassProvider.BASIC_RULES.init(builder);
           BazelRuleClassProvider.CPP_RULES.init(builder);
-          builder.addRuleDefinition(new OnlyCppToolchainLookupRule());
+          builder.addRuleDefinition(new OnlyCppToolchainTypeRule());
           return builder.build();
         }