Rename Root to ArtifactRoot.

This is slightly more descriptive, and we will potentially want to use the name Root for a broader concept shared between ArtifactRoot and RootedPath.

PiperOrigin-RevId: 182082367

3 files changed, 12 insertions, 12 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLineTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLineTest.java
index 99aa8a7d7c..1e9b36d653 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLineTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLineTest.java
@@ -18,7 +18,7 @@ import static com.google.common.truth.Truth.assertThat;
 import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableSet;
 import com.google.devtools.build.lib.actions.Artifact;
-import com.google.devtools.build.lib.actions.Root;
+import com.google.devtools.build.lib.actions.ArtifactRoot;
 import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
 import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.FeatureConfiguration;
 import com.google.devtools.build.lib.rules.cpp.CompileCommandLine.Builder;
@@ -42,7 +42,7 @@ public class CompileCommandLineTest extends BuildViewTestCase {
   private Artifact scratchArtifact(String s) {
     Path execRoot = outputBase.getRelative("exec");
     Path outputRoot = execRoot.getRelative("root");
-    Root root = Root.asDerivedRoot(execRoot, outputRoot);
+    ArtifactRoot root = ArtifactRoot.asDerivedRoot(execRoot, outputRoot);
     try {
       return new Artifact(scratch.overwriteFile(outputRoot.getRelative(s).toString()), root);
     } catch (IOException e) {
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java
index 6107747ffe..703c3ffb73 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java
@@ -30,8 +30,8 @@ import com.google.devtools.build.lib.actions.Artifact.SpecialArtifact;
 import com.google.devtools.build.lib.actions.Artifact.SpecialArtifactType;
 import com.google.devtools.build.lib.actions.Artifact.TreeFileArtifact;
 import com.google.devtools.build.lib.actions.ArtifactOwner;
+import com.google.devtools.build.lib.actions.ArtifactRoot;
 import com.google.devtools.build.lib.actions.ResourceSet;
-import com.google.devtools.build.lib.actions.Root;
 import com.google.devtools.build.lib.actions.util.ActionsTestUtil;
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
 import com.google.devtools.build.lib.analysis.RuleContext;
@@ -82,7 +82,7 @@ public class CppLinkActionTest extends BuildViewTestCase {
           }
 
           @Override
-          public Artifact getDerivedArtifact(PathFragment rootRelativePath, Root root) {
+          public Artifact getDerivedArtifact(PathFragment rootRelativePath, ArtifactRoot root) {
             return CppLinkActionTest.this.getDerivedArtifact(
                 rootRelativePath, root, ActionsTestUtil.NULL_ARTIFACT_OWNER);
           }
@@ -533,7 +533,7 @@ public class CppLinkActionTest extends BuildViewTestCase {
   private Artifact scratchArtifact(String s) {
     Path execRoot = outputBase.getRelative("exec");
     Path outputRoot = execRoot.getRelative("out");
-    Root root = Root.asDerivedRoot(execRoot, outputRoot);
+    ArtifactRoot root = ArtifactRoot.asDerivedRoot(execRoot, outputRoot);
     try {
       return new Artifact(scratch.overwriteFile(outputRoot.getRelative(s).toString()), root);
     } catch (IOException e) {
@@ -673,7 +673,7 @@ public class CppLinkActionTest extends BuildViewTestCase {
     Path path = execRoot.getRelative(execPath);
     return new SpecialArtifact(
         path,
-        Root.asDerivedRoot(execRoot, execRoot.getRelative("out")),
+        ArtifactRoot.asDerivedRoot(execRoot, execRoot.getRelative("out")),
         execPath,
         ArtifactOwner.NULL_OWNER,
         SpecialArtifactType.TREE);
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CreateIncSymlinkActionTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CreateIncSymlinkActionTest.java
index b7ea510c70..273d986133 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CreateIncSymlinkActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CreateIncSymlinkActionTest.java
@@ -20,7 +20,7 @@ import static com.google.devtools.build.lib.actions.util.ActionsTestUtil.NULL_AC
 import com.google.common.collect.ImmutableMap;
 import com.google.devtools.build.lib.actions.ActionKeyContext;
 import com.google.devtools.build.lib.actions.Artifact;
-import com.google.devtools.build.lib.actions.Root;
+import com.google.devtools.build.lib.actions.ArtifactRoot;
 import com.google.devtools.build.lib.testutil.FoundationTestCase;
 import com.google.devtools.build.lib.vfs.Path;
 import com.google.devtools.build.lib.vfs.PathFragment;
@@ -39,7 +39,7 @@ public class CreateIncSymlinkActionTest extends FoundationTestCase {
 
   @Test
   public void testDifferentOrderSameActionKey() throws Exception {
-    Root root = Root.asDerivedRoot(rootDirectory, rootDirectory.getRelative("out"));
+    ArtifactRoot root = ArtifactRoot.asDerivedRoot(rootDirectory, rootDirectory.getRelative("out"));
     Artifact a = new Artifact(PathFragment.create("a"), root);
     Artifact b = new Artifact(PathFragment.create("b"), root);
     Artifact c = new Artifact(PathFragment.create("c"), root);
@@ -59,7 +59,7 @@ public class CreateIncSymlinkActionTest extends FoundationTestCase {
 
   @Test
   public void testDifferentTargetsDifferentActionKey() throws Exception {
-    Root root = Root.asDerivedRoot(rootDirectory, rootDirectory.getRelative("out"));
+    ArtifactRoot root = ArtifactRoot.asDerivedRoot(rootDirectory, rootDirectory.getRelative("out"));
     Artifact a = new Artifact(PathFragment.create("a"), root);
     Artifact b = new Artifact(PathFragment.create("b"), root);
     CreateIncSymlinkAction action1 = new CreateIncSymlinkAction(NULL_ACTION_OWNER,
@@ -75,7 +75,7 @@ public class CreateIncSymlinkActionTest extends FoundationTestCase {
 
   @Test
   public void testDifferentSymlinksDifferentActionKey() throws Exception {
-    Root root = Root.asDerivedRoot(rootDirectory, rootDirectory.getRelative("out"));
+    ArtifactRoot root = ArtifactRoot.asDerivedRoot(rootDirectory, rootDirectory.getRelative("out"));
     Artifact a = new Artifact(PathFragment.create("a"), root);
     Artifact b = new Artifact(PathFragment.create("b"), root);
     CreateIncSymlinkAction action1 = new CreateIncSymlinkAction(NULL_ACTION_OWNER,
@@ -93,7 +93,7 @@ public class CreateIncSymlinkActionTest extends FoundationTestCase {
   public void testExecute() throws Exception {
     Path outputDir = rootDirectory.getRelative("out");
     outputDir.createDirectory();
-    Root root = Root.asDerivedRoot(rootDirectory, outputDir);
+    ArtifactRoot root = ArtifactRoot.asDerivedRoot(rootDirectory, outputDir);
     Path symlink = rootDirectory.getRelative("out/a");
     Artifact a = new Artifact(symlink, root);
     Artifact b = new Artifact(PathFragment.create("b"), root);
@@ -110,7 +110,7 @@ public class CreateIncSymlinkActionTest extends FoundationTestCase {
   public void testFileRemoved() throws Exception {
     Path outputDir = rootDirectory.getRelative("out");
     outputDir.createDirectory();
-    Root root = Root.asDerivedRoot(rootDirectory, outputDir);
+    ArtifactRoot root = ArtifactRoot.asDerivedRoot(rootDirectory, outputDir);
     Path symlink = rootDirectory.getRelative("out/subdir/a");
     Artifact a = new Artifact(symlink, root);
     Artifact b = new Artifact(PathFragment.create("b"), root);