aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Laurent Le Brun <laurentlb@google.com>2017-02-15 14:21:20 +0000
committerGravatar Dmitry Lomov <dslomov@google.com>2017-02-15 14:49:52 +0000
commiteffe8e92cbc80917639041d821730e7d46070f95 (patch)
treeb0dde734e3699898b96cbc9d02edf864b47304c0
parentc37d9926372e7ad2bfe6729c726a4388f2165354 (diff)
Remove special-casing of the 'native' module.
It should show up in the documentation in the same way as 'attr', another builtin module. -- PiperOrigin-RevId: 147589912 MOS_MIGRATED_REVID=147589912
-rw-r--r--src/main/java/com/google/devtools/build/docgen/templates/skylark-nav.vm3
-rw-r--r--src/main/java/com/google/devtools/build/lib/packages/SkylarkNativeModule.java27
2 files changed, 15 insertions, 15 deletions
diff --git a/src/main/java/com/google/devtools/build/docgen/templates/skylark-nav.vm b/src/main/java/com/google/devtools/build/docgen/templates/skylark-nav.vm
index 82e8240b82..4d095897e4 100644
--- a/src/main/java/com/google/devtools/build/docgen/templates/skylark-nav.vm
+++ b/src/main/java/com/google/devtools/build/docgen/templates/skylark-nav.vm
@@ -1,5 +1,4 @@
+<li><a href="{{ page.version_prefix }}/docs/skylark/lib/globals.html">Globals</a></li>
<li><a href="{{ page.version_prefix }}/docs/skylark/lib/skylark-builtin.html">Builtin Types and Modules</a></li>
<li><a href="{{ page.version_prefix }}/docs/skylark/lib/skylark-configuration-fragment.html">Configuration fragments</a></li>
<li><a href="{{ page.version_prefix }}/docs/skylark/lib/skylark-provider.html">Providers</a></li>
-<li><a href="{{ page.version_prefix }}/docs/skylark/lib/globals.html">Globals</a></li>
-<li><a href="{{ page.version_prefix }}/docs/skylark/lib/native.html">Native Module</a></li>
diff --git a/src/main/java/com/google/devtools/build/lib/packages/SkylarkNativeModule.java b/src/main/java/com/google/devtools/build/lib/packages/SkylarkNativeModule.java
index 776dfa6f36..d78463557d 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/SkylarkNativeModule.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/SkylarkNativeModule.java
@@ -28,19 +28,20 @@ import com.google.devtools.build.lib.syntax.SkylarkList;
import com.google.devtools.build.lib.syntax.SkylarkSignatureProcessor;
import com.google.devtools.build.lib.syntax.Type.ConversionException;
-/**
- * A class for the Skylark native module.
- */
-@SkylarkModule(name = "native", namespace = true,
- title = "Native Module",
- category = SkylarkModuleCategory.TOP_LEVEL_TYPE,
- doc =
- "A built-in module to support native rules and other package helper functions. "
- + "All native rules appear as functions in this module, e.g. <code>native.cc_library</code>. "
- + "Note that the native module is only available in the loading phase "
- + "(i.e. for macros, not for rule implementations). Attributes will ignore <code>None</code> "
- + "values, and treat them as if the attribute was unset.<br>"
- + "The following functions are also available:")
+/** A class for the Skylark native module. */
+@SkylarkModule(
+ name = "native",
+ namespace = true,
+ category = SkylarkModuleCategory.BUILTIN,
+ doc =
+ "A built-in module to support native rules and other package helper functions. "
+ + "All native rules appear as functions in this module, e.g. "
+ + "<code>native.cc_library</code>. "
+ + "Note that the native module is only available in the loading phase "
+ + "(i.e. for macros, not for rule implementations). Attributes will ignore "
+ + "<code>None</code> values, and treat them as if the attribute was unset.<br>"
+ + "The following functions are also available:"
+)
public class SkylarkNativeModule {
@SkylarkSignature(