diff options
author | 2018-01-29 14:49:04 -0800 | |
---|---|---|
committer | 2018-01-29 14:50:53 -0800 | |
commit | 016a42bc5e6368fb34a52394e93058348c4ef1a3 (patch) | |
tree | 418f20642a554a312f3c14ec1c7613fa795afeaf /src/main/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalValue.java | |
parent | ac03ccfc4377d4de0385ef05702289c9fa285d69 (diff) |
Remove unused "pattern" feature in RecursiveFilesystemTraversalFunction.
PiperOrigin-RevId: 183731563
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalValue.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalValue.java | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalValue.java index e791b5c202..247e546335 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalValue.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalValue.java @@ -29,7 +29,6 @@ import com.google.devtools.build.lib.vfs.RootedPath; import com.google.devtools.build.skyframe.LegacySkyKey; import com.google.devtools.build.skyframe.SkyKey; import com.google.devtools.build.skyframe.SkyValue; -import java.util.regex.Pattern; import javax.annotation.Nullable; /** @@ -133,27 +132,22 @@ public final class RecursiveFilesystemTraversalValue implements SkyValue { */ final boolean skipTestingForSubpackage; - /** A pattern that files must match to be included in this traversal (may be null.) */ - @Nullable - final Pattern pattern; - /** Information to be attached to any error messages that may be reported. */ @Nullable final String errorInfo; public TraversalRequest(RootedPath path, boolean isRootGenerated, PackageBoundaryMode crossPkgBoundaries, boolean skipTestingForSubpackage, - @Nullable String errorInfo, @Nullable Pattern pattern) { + @Nullable String errorInfo) { this.path = path; this.isGenerated = isRootGenerated; this.crossPkgBoundaries = crossPkgBoundaries; this.skipTestingForSubpackage = skipTestingForSubpackage; this.errorInfo = errorInfo; - this.pattern = pattern; } private TraversalRequest duplicate(RootedPath newRoot, boolean newSkipTestingForSubpackage) { return new TraversalRequest(newRoot, isGenerated, crossPkgBoundaries, - newSkipTestingForSubpackage, errorInfo, pattern); + newSkipTestingForSubpackage, errorInfo); } /** Creates a new request to traverse a child element in the current directory (the root). */ @@ -183,23 +177,20 @@ public final class RecursiveFilesystemTraversalValue implements SkyValue { TraversalRequest o = (TraversalRequest) obj; return path.equals(o.path) && isGenerated == o.isGenerated && crossPkgBoundaries == o.crossPkgBoundaries - && skipTestingForSubpackage == o.skipTestingForSubpackage - && Objects.equal(pattern, o.pattern); + && skipTestingForSubpackage == o.skipTestingForSubpackage; } @Override public int hashCode() { - return Objects.hashCode(path, isGenerated, crossPkgBoundaries, skipTestingForSubpackage, - pattern); + return Objects.hashCode(path, isGenerated, crossPkgBoundaries, skipTestingForSubpackage); } @Override public String toString() { return String.format( "TraversalParams(root=%s, is_generated=%d, skip_testing_for_subpkg=%d," - + " pkg_boundaries=%s, pattern=%s)", path, isGenerated ? 1 : 0, - skipTestingForSubpackage ? 1 : 0, crossPkgBoundaries, - pattern == null ? "null" : pattern.pattern()); + + " pkg_boundaries=%s)", path, isGenerated ? 1 : 0, + skipTestingForSubpackage ? 1 : 0, crossPkgBoundaries); } } |