Replaced other occurrences of Objects#toStringHelper with MoreObjects#toStringHelper

--
MOS_MIGRATED_REVID=98383075

4 files changed, 7 insertions, 9 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionValue.java
index 714325adcd..e2c6e1595f 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionValue.java
@@ -14,7 +14,7 @@
 package com.google.devtools.build.lib.skyframe;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
 import com.google.devtools.build.lib.actions.Action;
@@ -109,7 +109,7 @@ public class ActionExecutionValue implements SkyValue {
 
   @Override
   public String toString() {
-    return Objects.toStringHelper(this)
+    return MoreObjects.toStringHelper(this)
         .add("artifactData", artifactData)
         .add("additionalOutputData", additionalOutputData)
         .toString();
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/BuildInfoCollectionValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/BuildInfoCollectionValue.java
index 8958e1bd42..3633899471 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/BuildInfoCollectionValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/BuildInfoCollectionValue.java
@@ -38,10 +38,9 @@ public class BuildInfoCollectionValue extends ActionLookupValue {
     return collection;
   }
 
-  @SuppressWarnings("deprecation")
   @Override
   public String toString() {
-    return com.google.common.base.Objects.toStringHelper(getClass())
+    return com.google.common.base.MoreObjects.toStringHelper(getClass())
         .add("collection", collection)
         .add("generatingActionMap", generatingActionMap).toString();
   }
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/FileArtifactValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/FileArtifactValue.java
index 1fcd4912e9..1876397978 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/FileArtifactValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/FileArtifactValue.java
@@ -14,7 +14,7 @@
 package com.google.devtools.build.lib.skyframe;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.actions.cache.DigestUtils;
@@ -171,7 +171,7 @@ public class FileArtifactValue extends ArtifactValue {
 
   @Override
   public String toString() {
-    return Objects.toStringHelper(FileArtifactValue.class)
+    return MoreObjects.toStringHelper(FileArtifactValue.class)
         .add("digest", digest)
         .add("mtime", mtime)
         .add("size", size).toString();
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/MutableSupplier.java b/src/main/java/com/google/devtools/build/lib/skyframe/MutableSupplier.java
index 86de11d7ca..4897b244b6 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/MutableSupplier.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/MutableSupplier.java
@@ -13,7 +13,7 @@
 // limitations under the License.
 package com.google.devtools.build.lib.skyframe;
 
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Supplier;
 
 /**
@@ -37,10 +37,9 @@ public class MutableSupplier<T> implements Supplier<T> {
     val = newVal;
   }
 
-  @SuppressWarnings("deprecation")  // MoreObjects.toStringHelper() is not in Guava
   @Override
   public String toString() {
-    return Objects.toStringHelper(getClass())
+    return MoreObjects.toStringHelper(getClass())
         .add("val", val).toString();
   }
 }