Skip to content

Commit 61738b3

Browse files
borkaehwAndre Rocha
borkaehw
authored and
Andre Rocha
committed
Rename phases logically (bazel-contrib#953)
1 parent 317214c commit 61738b3

12 files changed

+174
-174
lines changed

‎scala/private/phases/phase_collect_jars.bzl

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,29 @@ load(
1313
"collect_jars",
1414
)
1515

16-
def phase_scalatest_collect_jars(ctx, p):
16+
def phase_collect_jars_scalatest(ctx, p):
1717
args = struct(
1818
base_classpath = p.scalac_provider.default_classpath + [ctx.attr._scalatest],
1919
extra_runtime_deps = [
2020
ctx.attr._scalatest_reporter,
2121
ctx.attr._scalatest_runner,
2222
],
2323
)
24-
return _phase_default_collect_jars(ctx, p, args)
24+
return _phase_collect_jars_default(ctx, p, args)
2525

26-
def phase_repl_collect_jars(ctx, p):
26+
def phase_collect_jars_repl(ctx, p):
2727
args = struct(
2828
base_classpath = p.scalac_provider.default_repl_classpath,
2929
)
30-
return _phase_default_collect_jars(ctx, p, args)
30+
return _phase_collect_jars_default(ctx, p, args)
3131

32-
def phase_macro_library_collect_jars(ctx, p):
32+
def phase_collect_jars_macro_library(ctx, p):
3333
args = struct(
3434
base_classpath = p.scalac_provider.default_macro_classpath,
3535
)
36-
return _phase_default_collect_jars(ctx, p, args)
36+
return _phase_collect_jars_default(ctx, p, args)
3737

38-
def phase_junit_test_collect_jars(ctx, p):
38+
def phase_collect_jars_junit_test(ctx, p):
3939
args = struct(
4040
extra_deps = [
4141
ctx.attr._junit,
@@ -44,18 +44,18 @@ def phase_junit_test_collect_jars(ctx, p):
4444
ctx.attr._bazel_test_runner,
4545
],
4646
)
47-
return _phase_default_collect_jars(ctx, p, args)
47+
return _phase_collect_jars_default(ctx, p, args)
4848

49-
def phase_library_for_plugin_bootstrapping_collect_jars(ctx, p):
49+
def phase_collect_jars_library_for_plugin_bootstrapping(ctx, p):
5050
args = struct(
5151
unused_dependency_checker_mode = "off",
5252
)
53-
return _phase_default_collect_jars(ctx, p, args)
53+
return _phase_collect_jars_default(ctx, p, args)
5454

55-
def phase_common_collect_jars(ctx, p):
56-
return _phase_default_collect_jars(ctx, p)
55+
def phase_collect_jars_common(ctx, p):
56+
return _phase_collect_jars_default(ctx, p)
5757

58-
def _phase_default_collect_jars(ctx, p, _args = struct()):
58+
def _phase_collect_jars_default(ctx, p, _args = struct()):
5959
return _phase_collect_jars(
6060
ctx,
6161
_args.base_classpath if hasattr(_args, "base_classpath") else p.scalac_provider.default_classpath,

‎scala/private/phases/phase_compile.bzl

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ _empty_coverage_struct = struct(
2828
replacements = {},
2929
)
3030

31-
def phase_binary_compile(ctx, p):
31+
def phase_compile_binary(ctx, p):
3232
args = struct(
3333
buildijar = False,
3434
unused_dependency_checker_ignored_targets = [
@@ -37,9 +37,9 @@ def phase_binary_compile(ctx, p):
3737
ctx.attr.unused_dependency_checker_ignored_targets
3838
],
3939
)
40-
return _phase_default_compile(ctx, p, args)
40+
return _phase_compile_default(ctx, p, args)
4141

42-
def phase_library_compile(ctx, p):
42+
def phase_compile_library(ctx, p):
4343
args = struct(
4444
srcjars = p.collect_srcjars,
4545
unused_dependency_checker_ignored_targets = [
@@ -48,19 +48,19 @@ def phase_library_compile(ctx, p):
4848
ctx.attr.unused_dependency_checker_ignored_targets
4949
],
5050
)
51-
return _phase_default_compile(ctx, p, args)
51+
return _phase_compile_default(ctx, p, args)
5252

53-
def phase_library_for_plugin_bootstrapping_compile(ctx, p):
53+
def phase_compile_library_for_plugin_bootstrapping(ctx, p):
5454
args = struct(
5555
unused_dependency_checker_ignored_targets = [
5656
target.label
5757
for target in p.scalac_provider.default_classpath + ctx.attr.exports
5858
],
5959
unused_dependency_checker_mode = "off",
6060
)
61-
return _phase_default_compile(ctx, p, args)
61+
return _phase_compile_default(ctx, p, args)
6262

63-
def phase_macro_library_compile(ctx, p):
63+
def phase_compile_macro_library(ctx, p):
6464
args = struct(
6565
buildijar = False,
6666
unused_dependency_checker_ignored_targets = [
@@ -69,9 +69,9 @@ def phase_macro_library_compile(ctx, p):
6969
ctx.attr.unused_dependency_checker_ignored_targets
7070
],
7171
)
72-
return _phase_default_compile(ctx, p, args)
72+
return _phase_compile_default(ctx, p, args)
7373

74-
def phase_junit_test_compile(ctx, p):
74+
def phase_compile_junit_test(ctx, p):
7575
args = struct(
7676
buildijar = False,
7777
implicit_junit_deps_needed_for_java_compilation = [
@@ -89,9 +89,9 @@ def phase_junit_test_compile(ctx, p):
8989
ctx.attr._bazel_test_runner.label,
9090
],
9191
)
92-
return _phase_default_compile(ctx, p, args)
92+
return _phase_compile_default(ctx, p, args)
9393

94-
def phase_repl_compile(ctx, p):
94+
def phase_compile_repl(ctx, p):
9595
args = struct(
9696
buildijar = False,
9797
unused_dependency_checker_ignored_targets = [
@@ -100,9 +100,9 @@ def phase_repl_compile(ctx, p):
100100
ctx.attr.unused_dependency_checker_ignored_targets
101101
],
102102
)
103-
return _phase_default_compile(ctx, p, args)
103+
return _phase_compile_default(ctx, p, args)
104104

105-
def phase_scalatest_compile(ctx, p):
105+
def phase_compile_scalatest(ctx, p):
106106
args = struct(
107107
buildijar = False,
108108
unused_dependency_checker_ignored_targets = [
@@ -111,12 +111,12 @@ def phase_scalatest_compile(ctx, p):
111111
ctx.attr.unused_dependency_checker_ignored_targets
112112
],
113113
)
114-
return _phase_default_compile(ctx, p, args)
114+
return _phase_compile_default(ctx, p, args)
115115

116-
def phase_common_compile(ctx, p):
117-
return _phase_default_compile(ctx, p)
116+
def phase_compile_common(ctx, p):
117+
return _phase_compile_default(ctx, p)
118118

119-
def _phase_default_compile(ctx, p, _args = struct()):
119+
def _phase_compile_default(ctx, p, _args = struct()):
120120
return _phase_compile(
121121
ctx,
122122
p,

‎scala/private/phases/phase_default_info.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# DOCUMENT THIS
55
#
6-
def phase_binary_default_info(ctx, p):
6+
def phase_default_info_binary(ctx, p):
77
return struct(
88
external_providers = [
99
DefaultInfo(
@@ -14,7 +14,7 @@ def phase_binary_default_info(ctx, p):
1414
],
1515
)
1616

17-
def phase_library_default_info(ctx, p):
17+
def phase_default_info_library(ctx, p):
1818
return struct(
1919
external_providers = [
2020
DefaultInfo(
@@ -24,7 +24,7 @@ def phase_library_default_info(ctx, p):
2424
],
2525
)
2626

27-
def phase_scalatest_default_info(ctx, p):
27+
def phase_default_info_scalatest(ctx, p):
2828
return struct(
2929
external_providers = [
3030
DefaultInfo(

‎scala/private/phases/phase_java_wrapper.bzl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ load(
88
_java_bin = "java_bin",
99
)
1010

11-
def phase_repl_java_wrapper(ctx, p):
11+
def phase_java_wrapper_repl(ctx, p):
1212
args = struct(
1313
args = " ".join(ctx.attr.scalacopts),
1414
wrapper_preamble = """
@@ -26,12 +26,12 @@ function finish() {
2626
trap finish EXIT
2727
""",
2828
)
29-
return _phase_default_java_wrapper(ctx, p, args)
29+
return _phase_java_wrapper_default(ctx, p, args)
3030

31-
def phase_common_java_wrapper(ctx, p):
32-
return _phase_default_java_wrapper(ctx, p)
31+
def phase_java_wrapper_common(ctx, p):
32+
return _phase_java_wrapper_default(ctx, p)
3333

34-
def _phase_default_java_wrapper(ctx, p, _args = struct()):
34+
def _phase_java_wrapper_default(ctx, p, _args = struct()):
3535
return _phase_java_wrapper(
3636
ctx,
3737
_args.args if hasattr(_args, "args") else "",

‎scala/private/phases/phase_runfiles.bzl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
#
44
# DOCUMENT THIS
55
#
6-
def phase_library_runfiles(ctx, p):
6+
def phase_runfiles_library(ctx, p):
77
args = struct(
88
# Using transitive_files since transitive_rjars a depset and avoiding linearization
99
transitive_files = p.compile.rjars,
1010
)
11-
return _phase_default_runfiles(ctx, p, args)
11+
return _phase_runfiles_default(ctx, p, args)
1212

13-
def phase_scalatest_runfiles(ctx, p):
13+
def phase_runfiles_scalatest(ctx, p):
1414
args = "\n".join([
1515
"-R",
1616
ctx.outputs.jar.short_path,
@@ -29,12 +29,12 @@ def phase_scalatest_runfiles(ctx, p):
2929
),
3030
args_file = args_file,
3131
)
32-
return _phase_default_runfiles(ctx, p, args)
32+
return _phase_runfiles_default(ctx, p, args)
3333

34-
def phase_common_runfiles(ctx, p):
35-
return _phase_default_runfiles(ctx, p)
34+
def phase_runfiles_common(ctx, p):
35+
return _phase_runfiles_default(ctx, p)
3636

37-
def _phase_default_runfiles(ctx, p, _args = struct()):
37+
def _phase_runfiles_default(ctx, p, _args = struct()):
3838
return _phase_runfiles(
3939
ctx,
4040
_args.transitive_files if hasattr(_args, "transitive_files") else depset(

‎scala/private/phases/phase_write_executable.bzl

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ load(
1616
_coverage_replacements_provider = "coverage_replacements_provider",
1717
)
1818

19-
def phase_scalatest_write_executable(ctx, p):
19+
def phase_write_executable_scalatest(ctx, p):
2020
# jvm_flags passed in on the target override scala_test_jvm_flags passed in on the
2121
# toolchain
2222
final_jvm_flags = first_non_empty(
@@ -31,26 +31,26 @@ def phase_scalatest_write_executable(ctx, p):
3131
] + expand_location(ctx, final_jvm_flags),
3232
use_jacoco = ctx.configuration.coverage_enabled,
3333
)
34-
return _phase_deafult_write_executable(ctx, p, args)
34+
return _phase_write_executable_default(ctx, p, args)
3535

36-
def phase_repl_write_executable(ctx, p):
36+
def phase_write_executable_repl(ctx, p):
3737
args = struct(
3838
jvm_flags = ["-Dscala.usejavacp=true"] + ctx.attr.jvm_flags,
3939
main_class = "scala.tools.nsc.MainGenericRunner",
4040
)
41-
return _phase_deafult_write_executable(ctx, p, args)
41+
return _phase_write_executable_default(ctx, p, args)
4242

43-
def phase_junit_test_write_executable(ctx, p):
43+
def phase_write_executable_junit_test(ctx, p):
4444
args = struct(
4545
jvm_flags = p.jvm_flags + ctx.attr.jvm_flags,
4646
main_class = "com.google.testing.junit.runner.BazelTestRunner",
4747
)
48-
return _phase_deafult_write_executable(ctx, p, args)
48+
return _phase_write_executable_default(ctx, p, args)
4949

50-
def phase_common_write_executable(ctx, p):
51-
return _phase_deafult_write_executable(ctx, p)
50+
def phase_write_executable_common(ctx, p):
51+
return _phase_write_executable_default(ctx, p)
5252

53-
def _phase_deafult_write_executable(ctx, p, _args = struct()):
53+
def _phase_write_executable_default(ctx, p, _args = struct()):
5454
return _phase_write_executable(
5555
ctx,
5656
p,

0 commit comments

Comments
 (0)