java.starlark.net: delete StarlarkBuiltin.namespace() bool
All it does it append a suffix to str(x), which adds very
marginal value (and sometimes subtracts---see the test).
Apropos of https://github.com/google/starlark-go\
/issues/274.
PiperOrigin-RevId: 315606558
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkAttrModuleApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkAttrModuleApi.java
index 37a0ee6..01b56f3 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkAttrModuleApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkAttrModuleApi.java
@@ -36,7 +36,6 @@
*/
@StarlarkBuiltin(
name = "attr",
- namespace = true,
category = StarlarkDocumentationCategory.TOP_LEVEL_TYPE,
doc =
"This is a top-level module for defining the attribute schemas of a rule or aspect. Each "
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkCommandLineApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkCommandLineApi.java
index b45aa9d..0327e28 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkCommandLineApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkCommandLineApi.java
@@ -26,7 +26,6 @@
/** Interface for a module associated with creating efficient command lines. */
@StarlarkBuiltin(
name = "cmd_helper",
- namespace = true,
category = StarlarkDocumentationCategory.TOP_LEVEL_TYPE,
doc = "Deprecated. Module for creating memory efficient command lines.")
@StarlarkDeprecated
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkConfigApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkConfigApi.java
index a241547..59277dff 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkConfigApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkConfigApi.java
@@ -29,7 +29,6 @@
*/
@StarlarkBuiltin(
name = "config",
- namespace = true,
category = StarlarkDocumentationCategory.BUILTIN,
doc =
"Note: This API is experimental and may change at any time."
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcToolchainConfigInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcToolchainConfigInfoApi.java
index 43dd32f..c66da2e 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcToolchainConfigInfoApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcToolchainConfigInfoApi.java
@@ -23,7 +23,6 @@
/** Additional layer of configurability for c++ rules through features and actions. */
@StarlarkBuiltin(
name = "CcToolchainConfigInfo",
- namespace = true,
category = StarlarkDocumentationCategory.PROVIDER,
doc =
"Additional layer of configurability for C++ rules. Encapsulates platform-dependent "
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/Starlark.java b/src/main/java/com/google/devtools/build/lib/syntax/Starlark.java
index 8a37866..becae28 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/Starlark.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/Starlark.java
@@ -238,8 +238,7 @@
StarlarkBuiltin module = StarlarkInterfaceUtils.getStarlarkBuiltin(c);
if (module != null) {
- String name = module.name();
- return module.namespace() ? name + " (a language module)" : name;
+ return module.name();
} else if (StarlarkCallable.class.isAssignableFrom(c)) {
// All callable values have historically been lumped together as "function".
diff --git a/src/main/java/net/starlark/java/annot/StarlarkBuiltin.java b/src/main/java/net/starlark/java/annot/StarlarkBuiltin.java
index e82cbfa..d75084a 100644
--- a/src/main/java/net/starlark/java/annot/StarlarkBuiltin.java
+++ b/src/main/java/net/starlark/java/annot/StarlarkBuiltin.java
@@ -67,11 +67,5 @@
/** Whether the module should appear in the documentation. */
boolean documented() default true;
- /**
- * If true, this type is a singleton top-level type whose main purpose is to act as a namespace
- * for other values.
- */
- boolean namespace() default false;
-
StarlarkDocumentationCategory category() default StarlarkDocumentationCategory.TOP_LEVEL_TYPE;
}
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleClassFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleClassFunctionsTest.java
index 089115e..ea1d36e 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleClassFunctionsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleClassFunctionsTest.java
@@ -695,9 +695,7 @@
@Test
public void testNoAttrLicense() throws Exception {
EvalException expected = assertThrows(EvalException.class, () -> ev.eval("attr.license()"));
- assertThat(expected)
- .hasMessageThat()
- .contains("'attr (a language module)' value has no field or method 'license'");
+ assertThat(expected).hasMessageThat().contains("'attr' value has no field or method 'license'");
}
@Test
