---

yaml
---
r: 148947
b: refs/heads/try2
c: 4352a8d
h: refs/heads/master
i:
  148945: 98c6d10
  148943: a51886d
v: v3

Author: colemickens

[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: a27934c555d9f61a4307abe218ad6884ad76343e
+refs/heads/try2: 4352a8d604c4643e37333c7054089569caa943c7
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/mk/docs.mk

@@ -205,6 +205,12 @@ doc/guide-tasks.html: $(D)/guide-tasks.md $(HTML_DEPS)
 	$(Q)$(CFG_NODE) $(D)/prep.js --highlight $< | \
 	$(CFG_PANDOC) $(HTML_OPTS) --output=$@
 
+DOCS += doc/guide-conditions.html
+doc/guide-conditions.html: $(D)/guide-conditions.md $(HTML_DEPS)
+	@$(call E, pandoc: $@)
+	$(Q)$(CFG_NODE) $(D)/prep.js --highlight $< | \
+	$(CFG_PANDOC) $(HTML_OPTS) --output=$@
+
 DOCS += doc/guide-pointers.html
 doc/guide-pointers.html: $(D)/guide-pointers.md $(HTML_DEPS)
 	@$(call E, pandoc: $@)
@@ -275,7 +281,8 @@ endif
 
 # The rustdoc executable, rpath included in case --disable-rpath was provided to
 # ./configure
-RUSTDOC = $(HBIN2_H_$(CFG_BUILD))/rustdoc$(X_$(CFG_BUILD))
+RUSTDOC = $(RPATH_VAR2_T_$(CFG_BUILD)_H_$(CFG_BUILD)) \
+	  $(HBIN2_H_$(CFG_BUILD))/rustdoc$(X_$(CFG_BUILD))
 
 # The library documenting macro
 #
@@ -290,9 +297,7 @@ doc/$(1)/index.html:							    \
 	    $$(foreach dep,$$(RUST_DEPS_$(1)),				    \
 		$$(TLIB2_T_$(CFG_BUILD)_H_$(CFG_BUILD))/stamp.$$(dep))
 	@$$(call E, rustdoc: $$@)
-	$$(Q)$$(RPATH_VAR2_T_$(CFG_BUILD)_H_$(CFG_BUILD)) $$(RUSTDOC) \
-	    --cfg stage2 $$<
-
+	$$(Q)$$(RUSTDOC) --cfg stage2 $$<
 endef
 
 $(foreach crate,$(CRATES),$(eval $(call libdoc,$(crate))))

branches/try2/mk/tests.mk

@@ -21,7 +21,7 @@ TEST_CRATES = $(TEST_TARGET_CRATES) $(TEST_HOST_CRATES)
 
 # Markdown files under doc/ that should have their code extracted and run
 DOC_TEST_NAMES = tutorial guide-ffi guide-macros guide-lifetimes \
-                 guide-tasks guide-container guide-pointers \
+                 guide-tasks guide-conditions guide-container guide-pointers \
                  complement-cheatsheet guide-runtime \
                  rust