From 111845955c1c136729a1c0a2226962309ca45957 Mon Sep 17 00:00:00 2001 From: Michajlo Matijkiw Date: Fri, 16 Oct 2015 19:00:45 +0000 Subject: Brief audit of singleton SkyValues Minimize indirection wrt singletons, turns out we had one that was completely unused. -- MOS_MIGRATED_REVID=105621494 --- .../google/devtools/build/lib/skyframe/PackageLookupFunction.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupFunction.java') diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupFunction.java index 5c612ca1b8..b49742a3ac 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/PackageLookupFunction.java @@ -66,7 +66,7 @@ public class PackageLookupFunction implements SkyFunction { } if (deletedPackages.get().contains(packageKey)) { - return PackageLookupValue.deletedPackage(); + return PackageLookupValue.DELETED_PACKAGE_VALUE; } // TODO(bazel-team): The following is O(n^2) on the number of elements on the package path due @@ -79,7 +79,7 @@ public class PackageLookupFunction implements SkyFunction { return value; } } - return PackageLookupValue.noBuildFile(); + return PackageLookupValue.NO_BUILD_FILE_VALUE; } @Nullable @@ -129,7 +129,7 @@ public class PackageLookupFunction implements SkyFunction { if (fileValue.isFile()) { return PackageLookupValue.success(buildFileRootedPath.getRoot()); } - return PackageLookupValue.noBuildFile(); + return PackageLookupValue.NO_BUILD_FILE_VALUE; } /** @@ -169,7 +169,7 @@ public class PackageLookupFunction implements SkyFunction { return PackageLookupValue.success(repositoryValue.getPath()); } } - return PackageLookupValue.noBuildFile(); + return PackageLookupValue.NO_BUILD_FILE_VALUE; } /** -- cgit v1.2.3