diff options
author | 2015-09-07 14:46:40 +0000 | |
---|---|---|
committer | 2015-09-08 09:04:35 +0000 | |
commit | 85adce72f90337f165982a53a0380bc2927322b5 (patch) | |
tree | d35a0a55291e1cab22312b1a002e811397d9233d /src/main/java/com | |
parent | d2a2461e69acef66401aa8dbcf00b06eb960de44 (diff) |
Random collection of cleanups.
--
MOS_MIGRATED_REVID=102497981
Diffstat (limited to 'src/main/java/com')
4 files changed, 7 insertions, 10 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/cmdline/ResolvedTargets.java b/src/main/java/com/google/devtools/build/lib/cmdline/ResolvedTargets.java index 806cd61872..f3f00c670d 100644 --- a/src/main/java/com/google/devtools/build/lib/cmdline/ResolvedTargets.java +++ b/src/main/java/com/google/devtools/build/lib/cmdline/ResolvedTargets.java @@ -65,6 +65,11 @@ public final class ResolvedTargets<T> { this.hasError = hasError; } + @Override + public String toString() { + return "ResolvedTargets(" + targets + ", hasError=" + hasError + ")"; + } + public boolean hasError() { return hasError; } diff --git a/src/main/java/com/google/devtools/build/lib/events/EventHandler.java b/src/main/java/com/google/devtools/build/lib/events/EventHandler.java index 28b626557f..6d0df6b77a 100644 --- a/src/main/java/com/google/devtools/build/lib/events/EventHandler.java +++ b/src/main/java/com/google/devtools/build/lib/events/EventHandler.java @@ -23,5 +23,5 @@ public interface EventHandler { /** * Handles an event. */ - public void handle(Event event); + void handle(Event event); } diff --git a/src/main/java/com/google/devtools/build/lib/pkgcache/CompileOneDependencyTransformer.java b/src/main/java/com/google/devtools/build/lib/pkgcache/CompileOneDependencyTransformer.java index b9cfb75d0f..0d22e68306 100644 --- a/src/main/java/com/google/devtools/build/lib/pkgcache/CompileOneDependencyTransformer.java +++ b/src/main/java/com/google/devtools/build/lib/pkgcache/CompileOneDependencyTransformer.java @@ -19,7 +19,6 @@ import com.google.devtools.build.lib.cmdline.TargetParsingException; import com.google.devtools.build.lib.events.EventHandler; import com.google.devtools.build.lib.packages.Attribute; import com.google.devtools.build.lib.packages.FileTarget; -import com.google.devtools.build.lib.packages.NoSuchPackageException; import com.google.devtools.build.lib.packages.NoSuchThingException; import com.google.devtools.build.lib.packages.Package; import com.google.devtools.build.lib.packages.RawAttributeMapper; @@ -90,12 +89,7 @@ final class CompileOneDependencyTransformer { target.getLabel() + "' must be a file"); } - Package pkg; - try { - pkg = pkgManager.getLoadedPackage(target.getLabel().getPackageIdentifier()); - } catch (NoSuchPackageException e) { - throw new IllegalStateException(e); - } + Package pkg = target.getPackage(); Iterable<Rule> orderedRuleList = getOrderedRuleList(pkg); // Consuming rule to return if no "preferred" rules have been found. diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternFunction.java index d805a91695..aca6ca8cc5 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternFunction.java @@ -85,8 +85,6 @@ public class TargetPatternFunction implements SkyFunction { return null; } - - /** * Used to declare all the exception types that can be wrapped in the exception thrown by * {@link TargetPatternFunction#compute}. |