diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis/skylark')
3 files changed, 4 insertions, 7 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkAttributesCollection.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkAttributesCollection.java index 41556c08bf..6821129be6 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkAttributesCollection.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkAttributesCollection.java @@ -40,7 +40,6 @@ import java.util.HashSet; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.Map.Entry; @SkylarkModule( name = "rule_attributes", @@ -240,7 +239,7 @@ class SkylarkAttributesCollection implements SkylarkValue { prereqsByLabel.put(target.getLabel(), target); } ImmutableMap.Builder<String, TransitiveInfoCollection> attrValue = ImmutableMap.builder(); - for (Entry<String, Label> entry : ((Map<String, Label>) val).entrySet()) { + for (Map.Entry<String, Label> entry : ((Map<String, Label>) val).entrySet()) { attrValue.put(entry.getKey(), prereqsByLabel.get(entry.getValue())); } attrBuilder.put(skyname, attrValue.build()); diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java index deab57c3c2..59a711a30e 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java @@ -58,7 +58,6 @@ import com.google.devtools.build.lib.packages.PackageFactory.PackageContext; import com.google.devtools.build.lib.packages.PredicateWithMessage; import com.google.devtools.build.lib.packages.Provider; import com.google.devtools.build.lib.packages.RuleClass; -import com.google.devtools.build.lib.packages.RuleClass.Builder; import com.google.devtools.build.lib.packages.RuleClass.Builder.RuleClassType; import com.google.devtools.build.lib.packages.RuleFactory; import com.google.devtools.build.lib.packages.RuleFactory.BuildLangTypedAttributeValuesMap; @@ -925,7 +924,7 @@ public class SkylarkRuleClassFunctions { private Label skylarkLabel; public SkylarkRuleFunction( - Builder builder, + RuleClass.Builder builder, RuleClassType type, ImmutableList<Pair<String, SkylarkAttr.Descriptor>> attributes, Location definitionLocation) { diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleContext.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleContext.java index c8e202a176..0614e1e33e 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleContext.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleContext.java @@ -96,7 +96,6 @@ import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; import javax.annotation.Nullable; @@ -519,8 +518,8 @@ public final class SkylarkRuleContext implements SkylarkValue { ruleContext.getSplitPrerequisites(attr.getName()); Map<Object, Object> splitPrereqsMap = new LinkedHashMap<>(); - for (Entry<Optional<String>, ? extends List<? extends TransitiveInfoCollection>> splitPrereq - : splitPrereqs.entrySet()) { + for (Map.Entry<Optional<String>, ? extends List<? extends TransitiveInfoCollection>> + splitPrereq : splitPrereqs.entrySet()) { Object value; if (attr.getType() == BuildType.LABEL) { |