commit e1d2e39bdaf895a7d7f611d7613df27929373a19
author cushon <cushon@google.com> Fri Sep 29 13:54:04 2017 -0400
committer John Cater <jcater@google.com> Fri Sep 29 15:09:56 2017 -0400
tree 299d04c0d18260091e7025d5327e51bcad7a1f91
parent 206f8663eee6b12f9cad2491f140d3a05c532215

Automatic code cleanup.

PiperOrigin-RevId: 170503143

src/main/java/com/google/devtools/build/lib/analysis/BuildView.java

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 cd641b1..07688e6 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 @@
         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);
   }
 

src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionFunction.java

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 d928a74..a92e809 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 @@
         @Nullable
         @Override
         public SkyKey apply(@Nullable Artifact artifact) {
-          return ArtifactSkyKey.key(artifact, /*mandatory=*/ false);
+          return ArtifactSkyKey.key(artifact, /*isMandatory=*/ false);
         }
       };
 

src/main/java/com/google/devtools/build/lib/skyframe/DiffAwarenessManager.java

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 26b90b5..8c9ffb7 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 @@
       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;
       }

src/main/java/com/google/devtools/build/lib/skyframe/SkyValueDirtinessChecker.java

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 4dd4e26..13cef78 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 @@
      * 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 @@
      * 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 @@
      * 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;