From 74706da1b101e08500978633755005b37c017da6 Mon Sep 17 00:00:00 2001 From: tomlu Date: Fri, 19 Jan 2018 06:20:57 -0800 Subject: Inline rarely used PathFragment methods that do not deserve to be on a core path class. PiperOrigin-RevId: 182526427 --- .../build/lib/rules/objc/BundleSupport.java | 4 +++- .../build/lib/rules/objc/CompilationSupport.java | 17 +++++++++++------ .../devtools/build/lib/rules/objc/ObjcCommon.java | 2 +- .../GraphBackedRecursivePackageProvider.java | 14 ++++++++++---- .../build/lib/skyframe/ProcessPackageDirectory.java | 7 ++++++- .../google/devtools/build/lib/vfs/PathFragment.java | 21 --------------------- 6 files changed, 31 insertions(+), 34 deletions(-) (limited to 'src/main/java/com/google/devtools') diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/BundleSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/BundleSupport.java index 1943f70c3b..e240e0485b 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/BundleSupport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/BundleSupport.java @@ -453,7 +453,9 @@ final class BundleSupport { } return commandLine - .addAll(ImmutableList.copyOf(PathFragment.safePathStrings(provider.get(XCASSETS_DIR)))) + .addAll( + ImmutableList.copyOf( + Iterables.transform(provider.get(XCASSETS_DIR), PathFragment::getSafePathString))) .addAll(ImmutableList.copyOf(extraActoolArgs)) .build(); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java index d29a6b4b74..6eadae643e 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java @@ -694,13 +694,18 @@ public class CompilationSupport { return frameworkNames // Add custom (non-SDK) framework search paths. For each framework foo/bar.framework, // include "foo" as a search path. - .addAll(PathFragment.safePathStrings( - uniqueParentDirectories(provider.getStaticFrameworkDirs()))) - .addAll(PathFragment.safePathStrings( - uniqueParentDirectories(provider.get(DYNAMIC_FRAMEWORK_DIR)))) .addAll( - PathFragment.safePathStrings( - uniqueParentDirectories(provider.get(FRAMEWORK_SEARCH_PATH_ONLY)))) + Iterables.transform( + uniqueParentDirectories(provider.getStaticFrameworkDirs()), + PathFragment::getSafePathString)) + .addAll( + Iterables.transform( + uniqueParentDirectories(provider.get(DYNAMIC_FRAMEWORK_DIR)), + PathFragment::getSafePathString)) + .addAll( + Iterables.transform( + uniqueParentDirectories(provider.get(FRAMEWORK_SEARCH_PATH_ONLY)), + PathFragment::getSafePathString)) .build(); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java index ae39cff451..ea55f9adbc 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java @@ -465,7 +465,7 @@ public final class ObjcCommon { Iterables.transform( Interspersing.prependEach( AppleToolchain.sdkDir() + "/usr/include/", - PathFragment.safePathStrings(attributes.sdkIncludes())), + Iterables.transform(attributes.sdkIncludes(), PathFragment::getSafePathString)), PathFragment::create); objcProvider .addAll(HEADER, filterFileset(attributes.hdrs())) diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/GraphBackedRecursivePackageProvider.java b/src/main/java/com/google/devtools/build/lib/skyframe/GraphBackedRecursivePackageProvider.java index f73ac247f1..ad8fc9997f 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/GraphBackedRecursivePackageProvider.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/GraphBackedRecursivePackageProvider.java @@ -13,6 +13,8 @@ // limitations under the License. package com.google.devtools.build.lib.skyframe; +import static com.google.common.collect.ImmutableSet.toImmutableSet; + import com.google.common.base.Function; import com.google.common.base.Objects; import com.google.common.base.Preconditions; @@ -269,11 +271,15 @@ public final class GraphBackedRecursivePackageProvider implements RecursivePacka if (subdirectoryTransitivelyContainsPackages.get(subdirectory)) { PathFragment subdirectoryRelativePath = subdirectory.getRelativePath(); ImmutableSet blacklistedSubdirectoriesBeneathThisSubdirectory = - PathFragment.filterPathsStartingWith( - info.blacklistedSubdirectories, subdirectoryRelativePath); + info.blacklistedSubdirectories + .stream() + .filter(pathFragment -> pathFragment.startsWith(subdirectoryRelativePath)) + .collect(toImmutableSet()); ImmutableSet excludedSubdirectoriesBeneathThisSubdirectory = - PathFragment.filterPathsStartingWith( - info.excludedSubdirectories, subdirectoryRelativePath); + info.excludedSubdirectories + .stream() + .filter(pathFragment -> pathFragment.startsWith(subdirectoryRelativePath)) + .collect(toImmutableSet()); if (!excludedSubdirectoriesBeneathThisSubdirectory.contains(subdirectoryRelativePath)) { subdirTraversalBuilder.add( new TraversalInfo( diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ProcessPackageDirectory.java b/src/main/java/com/google/devtools/build/lib/skyframe/ProcessPackageDirectory.java index d4fba1a2e3..ce995c9a5f 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/ProcessPackageDirectory.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/ProcessPackageDirectory.java @@ -13,6 +13,8 @@ // limitations under the License. package com.google.devtools.build.lib.skyframe; +import static com.google.common.collect.ImmutableSet.toImmutableSet; + import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -209,7 +211,10 @@ public class ProcessPackageDirectory { // TODO(bazel-team): Replace the excludedPaths set with a trie or a SortedSet for better // efficiency. ImmutableSet excludedSubdirectoriesBeneathThisSubdirectory = - PathFragment.filterPathsStartingWith(excludedPaths, subdirectory); + excludedPaths + .stream() + .filter(pathFragment -> pathFragment.startsWith(subdirectory)) + .collect(toImmutableSet()); RootedPath subdirectoryRootedPath = RootedPath.toRootedPath(root, subdirectory); childDeps.add( skyKeyTransformer.makeSkyKey( diff --git a/src/main/java/com/google/devtools/build/lib/vfs/PathFragment.java b/src/main/java/com/google/devtools/build/lib/vfs/PathFragment.java index 30a280292f..f385831862 100644 --- a/src/main/java/com/google/devtools/build/lib/vfs/PathFragment.java +++ b/src/main/java/com/google/devtools/build/lib/vfs/PathFragment.java @@ -13,12 +13,8 @@ // limitations under the License. package com.google.devtools.build.lib.vfs; -import static com.google.common.collect.ImmutableSet.toImmutableSet; - import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadSafe; import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; @@ -319,23 +315,6 @@ public abstract class PathFragment } } - /** - * Returns a sequence consisting of the {@link #getSafePathString()} return of each item in - * {@code fragments}. - */ - public static Iterable safePathStrings(Iterable fragments) { - return Iterables.transform(fragments, PathFragment::getSafePathString); - } - - /** Returns the subset of {@code paths} that start with {@code startingWithPath}. */ - public static ImmutableSet filterPathsStartingWith( - Set paths, PathFragment startingWithPath) { - return paths - .stream() - .filter(pathFragment -> pathFragment.startsWith(startingWithPath)) - .collect(toImmutableSet()); - } - /** * Throws {@link IllegalArgumentException} if {@code paths} contains any paths that * are equal to {@code startingWithPath} or that are not beneath {@code startingWithPath}. -- cgit v1.2.3