From f33e5cce943ebac93c9508897d7d56c0a92592ca Mon Sep 17 00:00:00 2001 From: Bor Kae Hwang Date: Thu, 30 Jan 2020 15:52:31 -0700 Subject: [PATCH] Use skylib path is_absolute --- scala/private/rule_impls.bzl | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/scala/private/rule_impls.bzl b/scala/private/rule_impls.bzl index c5747d1ca..68f16eeba 100644 --- a/scala/private/rule_impls.bzl +++ b/scala/private/rule_impls.bzl @@ -13,6 +13,7 @@ # limitations under the License. """Rules for supporting the Scala language.""" +load("@bazel_skylib//lib:paths.bzl", "paths") load( "@io_bazel_rules_scala//scala/private:coverage_replacements_provider.bzl", _coverage_replacements_provider = "coverage_replacements_provider", @@ -225,25 +226,12 @@ StatsfileOutput: {statsfile_output} ] + ["@" + argfile.path], ) -def _path_is_absolute(path): - # Returns true for absolute path in Linux/Mac (i.e., '/') or Windows (i.e., - # 'X:\' or 'X:/' where 'X' is a letter), false otherwise. - if len(path) >= 1 and path[0] == "/": - return True - if len(path) >= 3 and \ - path[0].isalpha() and \ - path[1] == ":" and \ - (path[2] == "/" or path[2] == "\\"): - return True - - return False - def runfiles_root(ctx): return "${TEST_SRCDIR}/%s" % ctx.workspace_name def java_bin(ctx): java_path = str(ctx.attr._java_runtime[java_common.JavaRuntimeInfo].java_executable_runfiles_path) - if _path_is_absolute(java_path): + if paths.is_absolute(java_path): javabin = java_path else: runfiles_root_var = runfiles_root(ctx)