Some cleanup changes.

--
MOS_MIGRATED_REVID=87821306

5 files changed, 9 insertions, 16 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java
index fa74a3ac55..50864716ad 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java
@@ -317,9 +317,9 @@ public abstract class CcLibrary implements RuleConfiguredTargetFactory {
       }
     } else {
       if (!linkstaticAttribute && appearsToHaveNoObjectFiles(ruleContext.attributes())) {
-        Artifact element = ccCompilationOutputs.getObjectFiles(false).isEmpty()
-            ? ccCompilationOutputs.getObjectFiles(true).get(0)
-            : ccCompilationOutputs.getObjectFiles(false).get(0);
+        Artifact element = Iterables.getFirst(
+            ccCompilationOutputs.getObjectFiles(false),
+            ccCompilationOutputs.getObjectFiles(true).get(0));
         ruleContext.attributeWarning("srcs",
              "this library appears at first glance to have no object files, "
              + "but on closer inspection it does have something to link, e.g. "
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainFeatures.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainFeatures.java
index a32d7710d1..25d01b989b 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainFeatures.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainFeatures.java
@@ -33,6 +33,7 @@ import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -839,12 +840,7 @@ public class CcToolchainFeatures implements Serializable {
      * @return whether a currently enabled feature implies the given feature.
      */
     private boolean isImpliedByEnabledFeature(Feature feature) {
-      for (Feature implies : impliedBy.get(feature)) {
-        if (enabled.contains(implies)) {
-          return true;
-        }
-      }
-      return false;
+      return !Collections.disjoint(impliedBy.get(feature), enabled);
     }
         
     /**
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/IncludeParser.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/IncludeParser.java
index 0b60b453ae..a164663063 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/IncludeParser.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/IncludeParser.java
@@ -87,7 +87,7 @@ public class IncludeParser implements SkyValue {
      *         are provided
      */
     public Rule(String type, String pattern, String findRoot, String findFilter) {
-      this(type, pattern, findRoot.replace("\\", "$"), Pattern.compile(findFilter));
+      this(type, pattern, findRoot.replace('\\', '$'), Pattern.compile(findFilter));
       Preconditions.checkArgument((this.type == Type.PATH) || (this.type == Type.FILE));
     }
 
@@ -365,7 +365,7 @@ public class IncludeParser implements SkyValue {
 
     @Override
     public String toString() {
-      return kind.toString() + ":" + pathFragment.getPathString();
+      return kind + ":" + pathFragment.getPathString();
     }
 
     @Override
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/IncludeScanner.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/IncludeScanner.java
index 9c00efd64a..65d89b9861 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/IncludeScanner.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/IncludeScanner.java
@@ -105,9 +105,7 @@ public interface IncludeScanner {
           List<PathFragment> quoteIncludeDirs = scannable.getQuoteIncludeDirs();
           List<String> cmdlineIncludes = scannable.getCmdlineIncludes();
 
-          for (PathFragment pathFragment : scannable.getSystemIncludeDirs()) {
-            includeDirs.add(pathFragment);
-          }
+          includeDirs.addAll(scannable.getSystemIncludeDirs());
 
           // Add the system include paths to the list of include paths.
           for (PathFragment pathFragment : action.getBuiltInIncludeDirectories()) {
@@ -149,7 +147,6 @@ public interface IncludeScanner {
 
       // Collect inputs and output
       List<Artifact> inputs = new ArrayList<>();
-      IncludeProblems includeProblems = new IncludeProblems();
       for (Artifact included : includes) {
         if (FileSystemUtils.startsWithAny(included.getPath(), absoluteBuiltInIncludeDirs)) {
           // Skip include files found in absolute include directories. This currently only applies
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkerInputs.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkerInputs.java
index 24120ce44f..63503caa0a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkerInputs.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkerInputs.java
@@ -83,7 +83,7 @@ public abstract class LinkerInputs {
 
     @Override
     public String toString() {
-      return "SimpleLinkerInput(" + artifact.toString() + ")";
+      return "SimpleLinkerInput(" + artifact + ")";
     }
   }