---

yaml
---
r: 149354
b: refs/heads/try2
c: f0cb0eb
h: refs/heads/master
v: v3

Author: alexcrichton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 9f68f793d444285e5d7f00f57b5635ece43613b3
+refs/heads/try2: f0cb0ebc669ade875c05cdef7da341a220d1b522
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/Makefile.in

@@ -19,17 +19,13 @@
 #
 # First, start with one of these build targets:
 #
-#   * all - The default. Build a complete, bootstrapped compiler.
+#   * all - The default. Builds a complete, bootstrapped compiler.
 #           `rustc` will be in `${target-triple}/stage2/bin/`. Run it
 #           directly from the build directory if you like. This also
 #           comes with docs in `doc/`.
 #
 #   * check - Run the complete test suite
 #
-#   * clean - Clean the build repertory. It is advised to run this
-#             command if you want to build Rust again, after an update
-#             of the git repository.
-#
 #   * install - Install Rust. Note that installation is not necessary
 #               to use the compiler.
 #
@@ -107,7 +103,7 @@
 #
 # </tips>
 #
-# <nitty-gritty>
+# <nittygritty>
 #
 # # The Rust Build System
 #
@@ -156,12 +152,12 @@
 # libraries are managed and versioned without polluting the common
 # areas of the filesystem.
 #
-# General rust binaries may still live in the host bin directory; they
+# General rust binaries may stil live in the host bin directory; they
 # will just link against the libraries in the target lib directory.
 #
 # Admittedly this is a little convoluted.
 #
-# </nitty-gritty>
+# </nittygritty>
 #
 
 ######################################################################

branches/try2/mk/main.mk

@@ -446,13 +446,13 @@ all: $(ALL_TARGET_RULES) $(GENERATED) docs
 # $(1) is the name of the doc <section> in Makefile.in
 # pick everything between tags | remove first line | remove last line
 # | remove extra (?) line | strip leading `#` from lines
-SHOW_DOCS = $(Q)awk '/<$(1)>/,/<\/$(1)>/' $(S)/Makefile.in | sed '1d' | sed '$$d' | sed 's/^\# \?//'
+SHOW_DOCS = $(Q)awk '/$(1)/,/<\/$(1)>/' $(S)/Makefile.in | sed '1d' | sed '$$d' | sed 's/^\# \?//'
 
 help:
 	$(call SHOW_DOCS,help)
 
-tips:
-	$(call SHOW_DOCS,tips)
+hot-tips:
+	$(call SHOW_DOCS,hottips)
 
 nitty-gritty:
-	$(call SHOW_DOCS,nitty-gritty)
+	$(call SHOW_DOCS,nittygritty)

branches/try2/src/librustdoc/html/render.rs

@@ -565,9 +565,16 @@ impl DocFolder for Cache {
             clean::StructItem(..) | clean::EnumItem(..) |
             clean::TypedefItem(..) | clean::TraitItem(..) |
             clean::FunctionItem(..) | clean::ModuleItem(..) |
-            clean::ForeignFunctionItem(..) | clean::VariantItem(..) => {
+            clean::ForeignFunctionItem(..) => {
                 self.paths.insert(item.id, (self.stack.clone(), shortty(&item)));
             }
+            // link variants to their parent enum because pages aren't emitted
+            // for each variant
+            clean::VariantItem(..) => {
+                let mut stack = self.stack.clone();
+                stack.pop();
+                self.paths.insert(item.id, (stack, "enum"));
+            }
             _ => {}
         }