diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleFileGlobals.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleFileGlobals.java
index 046a8edaa0759d..5ec7a3231bc3c7 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleFileGlobals.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleFileGlobals.java
@@ -167,30 +167,6 @@ static void validateModuleName(String moduleName) throws EvalException {
named = true,
positional = false,
defaultValue = "''"),
- @Param(
- name = "execution_platforms_to_register",
- doc =
- "A list of already-defined execution platforms to be registered when this module is"
- + " selected. Should be a list of absolute target patterns (ie. beginning with"
- + " either @
or //
). See toolchain resolution for more"
- + " information.",
- named = true,
- positional = false,
- allowedTypes = {@ParamType(type = Iterable.class, generic1 = String.class)},
- defaultValue = "[]"),
- @Param(
- name = "toolchains_to_register",
- doc =
- "A list of already-defined toolchains to be registered when this module is"
- + " selected. Should be a list of absolute target patterns (ie. beginning with"
- + " either @
or //
). See toolchain resolution for more"
- + " information.",
- named = true,
- positional = false,
- allowedTypes = {@ParamType(type = Iterable.class, generic1 = String.class)},
- defaultValue = "[]"),
},
useStarlarkThread = true)
public void module(
@@ -198,8 +174,6 @@ public void module(
String version,
StarlarkInt compatibilityLevel,
String repoName,
- Iterable> executionPlatformsToRegister,
- Iterable> toolchainsToRegister,
StarlarkThread thread)
throws EvalException {
if (moduleCalled) {
@@ -222,18 +196,11 @@ public void module(
} catch (ParseException e) {
throw new EvalException("Invalid version in module()", e);
}
- // TODO(wyv): migrate users of execution_platforms_to_register and toolchains_to_register to
- // register_execution_platforms and register_toolchains, and remove the former two attributes.
module
.setName(name)
.setVersion(parsedVersion)
.setCompatibilityLevel(compatibilityLevel.toInt("compatibility_level"))
- .setRepoName(repoName)
- .addExecutionPlatformsToRegister(
- checkAllAbsolutePatterns(
- executionPlatformsToRegister, "execution_platforms_to_register"))
- .addToolchainsToRegister(
- checkAllAbsolutePatterns(toolchainsToRegister, "toolchains_to_register"));
+ .setRepoName(repoName);
}
private static ImmutableList checkAllAbsolutePatterns(Iterable> iterable, String where)
diff --git a/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleFileFunctionTest.java b/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleFileFunctionTest.java
index 148a59784f7d76..d08a933adfe919 100644
--- a/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleFileFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleFileFunctionTest.java
@@ -183,13 +183,11 @@ public void testRootModule() throws Exception {
" name='aaa',",
" version='0.1',",
" compatibility_level=4,",
- " toolchains_to_register=['//my:toolchain', '//my:toolchain2'],",
- " execution_platforms_to_register=['//my:platform', '//my:platform2'],",
")",
"bazel_dep(name='bbb',version='1.0')",
"bazel_dep(name='ccc',version='2.0',repo_name='see')",
- "register_toolchains('//my:toolchain3', '//my:toolchain4')",
- "register_execution_platforms('//my:platform3', '//my:platform4')",
+ "register_toolchains('//my:toolchain', '//my:toolchain2')",
+ "register_execution_platforms('//my:platform', '//my:platform2')",
"single_version_override(module_name='ddd',version='18')",
"local_path_override(module_name='eee',path='somewhere/else')",
"multiple_version_override(module_name='fff',versions=['1.0','2.0'])",
@@ -209,11 +207,8 @@ public void testRootModule() throws Exception {
ModuleBuilder.create("aaa", "0.1", 4)
.setKey(ModuleKey.ROOT)
.addExecutionPlatformsToRegister(
- ImmutableList.of(
- "//my:platform", "//my:platform2", "//my:platform3", "//my:platform4"))
- .addToolchainsToRegister(
- ImmutableList.of(
- "//my:toolchain", "//my:toolchain2", "//my:toolchain3", "//my:toolchain4"))
+ ImmutableList.of("//my:platform", "//my:platform2"))
+ .addToolchainsToRegister(ImmutableList.of("//my:toolchain", "//my:toolchain2"))
.addDep("bbb", createModuleKey("bbb", "1.0"))
.addDep("see", createModuleKey("ccc", "2.0"))
.build());
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/RegisteredExecutionPlatformsFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/RegisteredExecutionPlatformsFunctionTest.java
index f6e91e015f8887..19e92ec85cf2bf 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/RegisteredExecutionPlatformsFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/RegisteredExecutionPlatformsFunctionTest.java
@@ -333,7 +333,7 @@ public void testRegisteredExecutionPlatforms_bzlmod() throws Exception {
setBuildLanguageOptions("--enable_bzlmod");
scratch.overwriteFile(
"MODULE.bazel",
- "module(execution_platforms_to_register=['//:plat'])",
+ "register_execution_platforms('//:plat')",
"bazel_dep(name='bbb',version='1.0')",
"bazel_dep(name='ccc',version='1.1')");
registry
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/RegisteredToolchainsFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/RegisteredToolchainsFunctionTest.java
index 2b72e4ebf0ab5f..4f6a11ea85d7d5 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/RegisteredToolchainsFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/RegisteredToolchainsFunctionTest.java
@@ -298,7 +298,7 @@ public void testRegisteredToolchains_bzlmod() throws Exception {
setBuildLanguageOptions("--enable_bzlmod");
scratch.overwriteFile(
"MODULE.bazel",
- "module(toolchains_to_register=['//:tool'])",
+ "register_toolchains('//:tool')",
"bazel_dep(name='bbb',version='1.0')",
"bazel_dep(name='ccc',version='1.1')",
"bazel_dep(name='toolchain_def',version='1.0')");