Automatic code cleanup.

PiperOrigin-RevId: 170503143
fulldecent · Sep 29, 2017 · e1d2e39 · e1d2e39
1 parent 206f866
commit e1d2e39
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 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
@@ -1245,7 +1245,7 @@ public RuleContext getRuleContextForTesting(
         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
@@ -484,7 +484,7 @@ private ActionExecutionValue checkCacheAndExecuteIfNeeded(
         @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
@@ -142,7 +142,7 @@ private DiffAwarenessState maybeGetDiffAwarenessState(Path pathEntry) {
       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
@@ -57,23 +57,23 @@ public static class DirtyResult {
      * graph.
      */
     public static DirtyResult notDirty(SkyValue oldValue) {
-      return new DirtyResult(/*dirty=*/false, oldValue,  /*newValue=*/null);
+      return new DirtyResult(/*isDirty=*/false, oldValue,  /*newValue=*/null);
     }
 
     /**
      * Creates a DirtyResult indicating that external value is different from the value in the
      * 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);
     }
 
     /**
      * Creates a DirtyResult indicating that the external value is {@code newValue}, which is
      * 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;