diff options
author | ulfjack <ulfjack@google.com> | 2017-07-19 09:50:07 +0200 |
---|---|---|
committer | Klaus Aehlig <aehlig@google.com> | 2017-07-19 10:22:53 +0200 |
commit | c8521d0e516f55dbc16c504f1406eded18578353 (patch) | |
tree | 30094a0a0f0827eed3260f8d743797fad87951d9 /src/main/java/com/google/devtools/build/lib/rules/genquery | |
parent | 48e8b9ff10c8bf7408e63be43decaa71cef188eb (diff) |
Make TargetPatternKey implement SkyKey instead of wrapping in LegacySkyKey
Makes for much nicer client code.
PiperOrigin-RevId: 162454439
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/genquery')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/genquery/GenQuery.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/genquery/GenQuery.java b/src/main/java/com/google/devtools/build/lib/rules/genquery/GenQuery.java index d967df0956..1901c7862e 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/genquery/GenQuery.java +++ b/src/main/java/com/google/devtools/build/lib/rules/genquery/GenQuery.java @@ -69,6 +69,7 @@ import com.google.devtools.build.lib.skyframe.PackageValue; import com.google.devtools.build.lib.skyframe.PrecomputedValue.Precomputed; import com.google.devtools.build.lib.skyframe.SkyFunctions; import com.google.devtools.build.lib.skyframe.TargetPatternValue; +import com.google.devtools.build.lib.skyframe.TargetPatternValue.TargetPatternKey; import com.google.devtools.build.lib.skyframe.TransitiveTargetValue; import com.google.devtools.build.lib.syntax.Type; import com.google.devtools.build.lib.util.Fingerprint; @@ -409,7 +410,7 @@ public class GenQuery implements RuleConfiguredTargetFactory { boolean ok = true; Map<String, ResolvedTargets<Target>> preloadedPatterns = Maps.newHashMapWithExpectedSize(patterns.size()); - Map<SkyKey, String> patternKeys = Maps.newHashMapWithExpectedSize(patterns.size()); + Map<TargetPatternKey, String> patternKeys = Maps.newHashMapWithExpectedSize(patterns.size()); for (String pattern : patterns) { checkValidPatternType(pattern); patternKeys.put(TargetPatternValue.key(pattern, FilteringPolicies.NO_FILTER, ""), pattern); |