Automatic code cleanup.

PiperOrigin-RevId: 170503143

4 files changed, 6 insertions, 6 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
index cd641b1d1c..07688e6474 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
@@ -1245,7 +1245,7 @@ public class BuildView {
         new CachingAnalysisEnvironment(getArtifactFactory(),
             new ConfiguredTargetKey(target.getLabel(), targetConfig),
             /*isSystemEnv=*/false, targetConfig.extendedSanityChecks(), eventHandler,
-            /*skyframeEnv=*/null, targetConfig.isActionsEnabled());
+            /*env=*/null, targetConfig.isActionsEnabled());
     return getRuleContextForTesting(eventHandler, target, env, configurations);
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionFunction.java
index d928a7419b..a92e809800 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionFunction.java
@@ -484,7 +484,7 @@ public class ActionExecutionFunction implements SkyFunction, CompletionReceiver
         @Nullable
         @Override
         public SkyKey apply(@Nullable Artifact artifact) {
-          return ArtifactSkyKey.key(artifact, /*mandatory=*/ false);
+          return ArtifactSkyKey.key(artifact, /*isMandatory=*/ false);
         }
       };
 
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/DiffAwarenessManager.java b/src/main/java/com/google/devtools/build/lib/skyframe/DiffAwarenessManager.java
index 26b90b59a2..8c9ffb7426 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/DiffAwarenessManager.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/DiffAwarenessManager.java
@@ -142,7 +142,7 @@ public final class DiffAwarenessManager {
       if (newDiffAwareness != null) {
         logger.info(
             "Using " + newDiffAwareness.name() + " DiffAwareness strategy for " + pathEntry);
-        diffAwarenessState = new DiffAwarenessState(newDiffAwareness, /*previousView=*/null);
+        diffAwarenessState = new DiffAwarenessState(newDiffAwareness, /*baselineView=*/null);
         currentDiffAwarenessStates.put(pathEntry, diffAwarenessState);
         return diffAwarenessState;
       }
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyValueDirtinessChecker.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyValueDirtinessChecker.java
index 4dd4e268f1..13cef78967 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyValueDirtinessChecker.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyValueDirtinessChecker.java
@@ -57,7 +57,7 @@ public abstract class SkyValueDirtinessChecker {
      * graph.
      */
     public static DirtyResult notDirty(SkyValue oldValue) {
-      return new DirtyResult(/*dirty=*/false, oldValue,  /*newValue=*/null);
+      return new DirtyResult(/*isDirty=*/false, oldValue,  /*newValue=*/null);
     }
 
     /**
@@ -65,7 +65,7 @@ public abstract class SkyValueDirtinessChecker {
      * graph, but this new value is not known.
      */
     public static DirtyResult dirty(@Nullable SkyValue oldValue) {
-      return new DirtyResult(/*dirty=*/true, oldValue, /*newValue=*/null);
+      return new DirtyResult(/*isDirty=*/true, oldValue, /*newValue=*/null);
     }
 
     /**
@@ -73,7 +73,7 @@ public abstract class SkyValueDirtinessChecker {
      * different from the value in the graph,
      */
     public static DirtyResult dirtyWithNewValue(@Nullable SkyValue oldValue, SkyValue newValue) {
-      return new DirtyResult(/*dirty=*/true, oldValue, newValue);
+      return new DirtyResult(/*isDirty=*/true, oldValue, newValue);
     }
 
     private final boolean isDirty;