diff options
| author |  janakr <janakr@google.com> | 2018-02-02 15:52:22 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-02-02 15:53:55 -0800 |
| commit | a56a6adf7c5d2829ea99f393f1a2d2d3d4488e0f (patch) | |
| tree | 2a7ec0955afd09a9fb1d39801b85dca6c2567bba /src/test/java/com/google/devtools/build/lib/analysis/CircularDependencyTest.java | |
| parent | 64d9a4d6dcd720a3b7a60ff550a17a7707dd41d0 (diff) | |
Stop allowing generic LateBoundDefault value types. Such types are always either a Label or a List<Label>. We can easily enforce this through static type checking, so do it.
This will help with LateBoundDefault serialization, since we don't have to serialize an arbitrary object.
PiperOrigin-RevId: 184347100
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/analysis/CircularDependencyTest.java')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/CircularDependencyTest.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/CircularDependencyTest.java b/src/test/java/com/google/devtools/build/lib/analysis/CircularDependencyTest.java index b4d91c341f..5673ebbeb3 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/CircularDependencyTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/CircularDependencyTest.java @@ -27,10 +27,9 @@ import com.google.devtools.build.lib.analysis.config.BuildConfiguration; import com.google.devtools.build.lib.analysis.config.BuildOptions; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; import com.google.devtools.build.lib.analysis.util.MockRule; -import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.events.Event; import com.google.devtools.build.lib.events.Location; -import com.google.devtools.build.lib.packages.Attribute.LateBoundDefault; +import com.google.devtools.build.lib.packages.Attribute.LabelLateBoundDefault; import com.google.devtools.build.lib.packages.AttributeMap; import com.google.devtools.build.lib.packages.NoSuchTargetException; import com.google.devtools.build.lib.packages.Package; @@ -236,8 +235,8 @@ public class CircularDependencyTest extends BuildViewTestCase { /** A late bound dependency which depends on the 'dep' label if the 'define' is in --defines. */ // TODO(b/65746853): provide a way to do this without passing the entire configuration - private static final LateBoundDefault<BuildConfiguration, Label> LATE_BOUND_DEP = - LateBoundDefault.fromTargetConfiguration( + private static final LabelLateBoundDefault<BuildConfiguration> LATE_BOUND_DEP = + LabelLateBoundDefault.fromTargetConfiguration( BuildConfiguration.class, null, (rule, attributes, config) -> |