rust-lang
diff --git a/‎[refs]
Lines changed: 1 addition & 1 deletion b/‎[refs]
Lines changed: 1 addition & 1 deletion
diff --git a/‎branches/try/mk/docs.mk
Lines changed: 5 additions & 5 deletions b/‎branches/try/mk/docs.mk
Lines changed: 5 additions & 5 deletions
diff --git a/‎branches/try/mk/tests.mk
Lines changed: 2 additions & 2 deletions b/‎branches/try/mk/tests.mk
Lines changed: 2 additions & 2 deletions
diff --git a/‎branches/try/src/doc/nomicon/README.md
Lines changed: 38 additions & 0 deletions b/‎branches/try/src/doc/nomicon/README.md
Lines changed: 38 additions & 0 deletions
diff --git a/‎branches/try/src/doc/tarpl/SUMMARY.md renamed to ‎branches/try/src/doc/nomicon/SUMMARY.md b/‎branches/try/src/doc/tarpl/SUMMARY.md renamed to ‎branches/try/src/doc/nomicon/SUMMARY.md
diff --git a/‎branches/try/src/doc/tarpl/arc-and-mutex.md renamed to ‎branches/try/src/doc/nomicon/arc-and-mutex.md b/‎branches/try/src/doc/tarpl/arc-and-mutex.md renamed to ‎branches/try/src/doc/nomicon/arc-and-mutex.md
diff --git a/‎branches/try/src/doc/tarpl/atomics.md renamed to ‎branches/try/src/doc/nomicon/atomics.md b/‎branches/try/src/doc/tarpl/atomics.md renamed to ‎branches/try/src/doc/nomicon/atomics.md
diff --git a/‎branches/try/src/doc/tarpl/borrow-splitting.md renamed to ‎branches/try/src/doc/nomicon/borrow-splitting.md b/‎branches/try/src/doc/tarpl/borrow-splitting.md renamed to ‎branches/try/src/doc/nomicon/borrow-splitting.md
diff --git a/‎branches/try/src/doc/tarpl/casts.md renamed to ‎branches/try/src/doc/nomicon/casts.md b/‎branches/try/src/doc/tarpl/casts.md renamed to ‎branches/try/src/doc/nomicon/casts.md
diff --git a/‎branches/try/src/doc/tarpl/checked-uninit.md renamed to ‎branches/try/src/doc/nomicon/checked-uninit.md b/‎branches/try/src/doc/tarpl/checked-uninit.md renamed to ‎branches/try/src/doc/nomicon/checked-uninit.md
diff --git a/‎branches/try/src/doc/tarpl/coercions.md renamed to ‎branches/try/src/doc/nomicon/coercions.md b/‎branches/try/src/doc/tarpl/coercions.md renamed to ‎branches/try/src/doc/nomicon/coercions.md
diff --git a/‎branches/try/src/doc/tarpl/concurrency.md renamed to ‎branches/try/src/doc/nomicon/concurrency.md b/‎branches/try/src/doc/tarpl/concurrency.md renamed to ‎branches/try/src/doc/nomicon/concurrency.md
diff --git a/‎branches/try/src/doc/tarpl/constructors.md renamed to ‎branches/try/src/doc/nomicon/constructors.md b/‎branches/try/src/doc/tarpl/constructors.md renamed to ‎branches/try/src/doc/nomicon/constructors.md
diff --git a/‎branches/try/src/doc/tarpl/conversions.md renamed to ‎branches/try/src/doc/nomicon/conversions.md b/‎branches/try/src/doc/tarpl/conversions.md renamed to ‎branches/try/src/doc/nomicon/conversions.md
diff --git a/‎branches/try/src/doc/tarpl/data.md renamed to ‎branches/try/src/doc/nomicon/data.md b/‎branches/try/src/doc/tarpl/data.md renamed to ‎branches/try/src/doc/nomicon/data.md
diff --git a/‎branches/try/src/doc/tarpl/destructors.md renamed to ‎branches/try/src/doc/nomicon/destructors.md b/‎branches/try/src/doc/tarpl/destructors.md renamed to ‎branches/try/src/doc/nomicon/destructors.md
diff --git a/‎branches/try/src/doc/tarpl/dot-operator.md renamed to ‎branches/try/src/doc/nomicon/dot-operator.md b/‎branches/try/src/doc/tarpl/dot-operator.md renamed to ‎branches/try/src/doc/nomicon/dot-operator.md
diff --git a/‎branches/try/src/doc/tarpl/drop-flags.md renamed to ‎branches/try/src/doc/nomicon/drop-flags.md b/‎branches/try/src/doc/tarpl/drop-flags.md renamed to ‎branches/try/src/doc/nomicon/drop-flags.md
diff --git a/‎branches/try/src/doc/tarpl/dropck.md renamed to ‎branches/try/src/doc/nomicon/dropck.md b/‎branches/try/src/doc/tarpl/dropck.md renamed to ‎branches/try/src/doc/nomicon/dropck.md
diff --git a/‎branches/try/src/doc/tarpl/exception-safety.md renamed to ‎branches/try/src/doc/nomicon/exception-safety.md b/‎branches/try/src/doc/tarpl/exception-safety.md renamed to ‎branches/try/src/doc/nomicon/exception-safety.md
diff --git a/‎branches/try/src/doc/tarpl/exotic-sizes.md renamed to ‎branches/try/src/doc/nomicon/exotic-sizes.md b/‎branches/try/src/doc/tarpl/exotic-sizes.md renamed to ‎branches/try/src/doc/nomicon/exotic-sizes.md
diff --git a/‎branches/try/src/doc/tarpl/hrtb.md renamed to ‎branches/try/src/doc/nomicon/hrtb.md b/‎branches/try/src/doc/tarpl/hrtb.md renamed to ‎branches/try/src/doc/nomicon/hrtb.md
diff --git a/‎branches/try/src/doc/tarpl/leaking.md renamed to ‎branches/try/src/doc/nomicon/leaking.md b/‎branches/try/src/doc/tarpl/leaking.md renamed to ‎branches/try/src/doc/nomicon/leaking.md
diff --git a/‎branches/try/src/doc/tarpl/lifetime-elision.md renamed to ‎branches/try/src/doc/nomicon/lifetime-elision.md b/‎branches/try/src/doc/tarpl/lifetime-elision.md renamed to ‎branches/try/src/doc/nomicon/lifetime-elision.md
diff --git a/‎branches/try/src/doc/tarpl/lifetime-mismatch.md renamed to ‎branches/try/src/doc/nomicon/lifetime-mismatch.md b/‎branches/try/src/doc/tarpl/lifetime-mismatch.md renamed to ‎branches/try/src/doc/nomicon/lifetime-mismatch.md
diff --git a/‎branches/try/src/doc/tarpl/lifetimes.md renamed to ‎branches/try/src/doc/nomicon/lifetimes.md b/‎branches/try/src/doc/tarpl/lifetimes.md renamed to ‎branches/try/src/doc/nomicon/lifetimes.md
diff --git a/‎branches/try/src/doc/tarpl/meet-safe-and-unsafe.md renamed to ‎branches/try/src/doc/nomicon/meet-safe-and-unsafe.md b/‎branches/try/src/doc/tarpl/meet-safe-and-unsafe.md renamed to ‎branches/try/src/doc/nomicon/meet-safe-and-unsafe.md
diff --git a/‎branches/try/src/doc/tarpl/obrm.md renamed to ‎branches/try/src/doc/nomicon/obrm.md b/‎branches/try/src/doc/tarpl/obrm.md renamed to ‎branches/try/src/doc/nomicon/obrm.md
diff --git a/‎branches/try/src/doc/tarpl/other-reprs.md renamed to ‎branches/try/src/doc/nomicon/other-reprs.md b/‎branches/try/src/doc/tarpl/other-reprs.md renamed to ‎branches/try/src/doc/nomicon/other-reprs.md
diff --git a/‎branches/try/src/doc/tarpl/ownership.md renamed to ‎branches/try/src/doc/nomicon/ownership.md b/‎branches/try/src/doc/tarpl/ownership.md renamed to ‎branches/try/src/doc/nomicon/ownership.md
diff --git a/‎branches/try/src/doc/tarpl/phantom-data.md renamed to ‎branches/try/src/doc/nomicon/phantom-data.md b/‎branches/try/src/doc/tarpl/phantom-data.md renamed to ‎branches/try/src/doc/nomicon/phantom-data.md
diff --git a/‎branches/try/src/doc/tarpl/poisoning.md renamed to ‎branches/try/src/doc/nomicon/poisoning.md b/‎branches/try/src/doc/tarpl/poisoning.md renamed to ‎branches/try/src/doc/nomicon/poisoning.md
diff --git a/‎branches/try/src/doc/tarpl/races.md renamed to ‎branches/try/src/doc/nomicon/races.md b/‎branches/try/src/doc/tarpl/races.md renamed to ‎branches/try/src/doc/nomicon/races.md
diff --git a/‎branches/try/src/doc/tarpl/references.md renamed to ‎branches/try/src/doc/nomicon/references.md b/‎branches/try/src/doc/tarpl/references.md renamed to ‎branches/try/src/doc/nomicon/references.md
diff --git a/‎branches/try/src/doc/tarpl/repr-rust.md renamed to ‎branches/try/src/doc/nomicon/repr-rust.md b/‎branches/try/src/doc/tarpl/repr-rust.md renamed to ‎branches/try/src/doc/nomicon/repr-rust.md
diff --git a/‎branches/try/src/doc/tarpl/safe-unsafe-meaning.md renamed to ‎branches/try/src/doc/nomicon/safe-unsafe-meaning.md b/‎branches/try/src/doc/tarpl/safe-unsafe-meaning.md renamed to ‎branches/try/src/doc/nomicon/safe-unsafe-meaning.md
diff --git a/‎branches/try/src/doc/tarpl/send-and-sync.md renamed to ‎branches/try/src/doc/nomicon/send-and-sync.md b/‎branches/try/src/doc/tarpl/send-and-sync.md renamed to ‎branches/try/src/doc/nomicon/send-and-sync.md
diff --git a/‎branches/try/src/doc/tarpl/subtyping.md renamed to ‎branches/try/src/doc/nomicon/subtyping.md b/‎branches/try/src/doc/tarpl/subtyping.md renamed to ‎branches/try/src/doc/nomicon/subtyping.md
diff --git a/‎branches/try/src/doc/tarpl/transmutes.md renamed to ‎branches/try/src/doc/nomicon/transmutes.md b/‎branches/try/src/doc/tarpl/transmutes.md renamed to ‎branches/try/src/doc/nomicon/transmutes.md
diff --git a/‎branches/try/src/doc/tarpl/unbounded-lifetimes.md renamed to ‎branches/try/src/doc/nomicon/unbounded-lifetimes.md b/‎branches/try/src/doc/tarpl/unbounded-lifetimes.md renamed to ‎branches/try/src/doc/nomicon/unbounded-lifetimes.md
diff --git a/‎branches/try/src/doc/tarpl/unchecked-uninit.md renamed to ‎branches/try/src/doc/nomicon/unchecked-uninit.md b/‎branches/try/src/doc/tarpl/unchecked-uninit.md renamed to ‎branches/try/src/doc/nomicon/unchecked-uninit.md
diff --git a/‎branches/try/src/doc/tarpl/uninitialized.md renamed to ‎branches/try/src/doc/nomicon/uninitialized.md b/‎branches/try/src/doc/tarpl/uninitialized.md renamed to ‎branches/try/src/doc/nomicon/uninitialized.md
diff --git a/‎branches/try/src/doc/tarpl/unwinding.md renamed to ‎branches/try/src/doc/nomicon/unwinding.md b/‎branches/try/src/doc/tarpl/unwinding.md renamed to ‎branches/try/src/doc/nomicon/unwinding.md
diff --git a/‎branches/try/src/doc/tarpl/vec-alloc.md renamed to ‎branches/try/src/doc/nomicon/vec-alloc.md b/‎branches/try/src/doc/tarpl/vec-alloc.md renamed to ‎branches/try/src/doc/nomicon/vec-alloc.md
diff --git a/‎branches/try/src/doc/tarpl/vec-dealloc.md renamed to ‎branches/try/src/doc/nomicon/vec-dealloc.md b/‎branches/try/src/doc/tarpl/vec-dealloc.md renamed to ‎branches/try/src/doc/nomicon/vec-dealloc.md
diff --git a/‎branches/try/src/doc/tarpl/vec-deref.md renamed to ‎branches/try/src/doc/nomicon/vec-deref.md b/‎branches/try/src/doc/tarpl/vec-deref.md renamed to ‎branches/try/src/doc/nomicon/vec-deref.md
diff --git a/‎branches/try/src/doc/tarpl/vec-drain.md renamed to ‎branches/try/src/doc/nomicon/vec-drain.md b/‎branches/try/src/doc/tarpl/vec-drain.md renamed to ‎branches/try/src/doc/nomicon/vec-drain.md
diff --git a/‎branches/try/src/doc/tarpl/vec-final.md renamed to ‎branches/try/src/doc/nomicon/vec-final.md b/‎branches/try/src/doc/tarpl/vec-final.md renamed to ‎branches/try/src/doc/nomicon/vec-final.md
diff --git a/‎branches/try/src/doc/tarpl/vec-insert-remove.md renamed to ‎branches/try/src/doc/nomicon/vec-insert-remove.md b/‎branches/try/src/doc/tarpl/vec-insert-remove.md renamed to ‎branches/try/src/doc/nomicon/vec-insert-remove.md
diff --git a/‎branches/try/src/doc/tarpl/vec-into-iter.md renamed to ‎branches/try/src/doc/nomicon/vec-into-iter.md b/‎branches/try/src/doc/tarpl/vec-into-iter.md renamed to ‎branches/try/src/doc/nomicon/vec-into-iter.md
diff --git a/‎branches/try/src/doc/tarpl/vec-layout.md renamed to ‎branches/try/src/doc/nomicon/vec-layout.md b/‎branches/try/src/doc/tarpl/vec-layout.md renamed to ‎branches/try/src/doc/nomicon/vec-layout.md
diff --git a/‎branches/try/src/doc/tarpl/vec-push-pop.md renamed to ‎branches/try/src/doc/nomicon/vec-push-pop.md b/‎branches/try/src/doc/tarpl/vec-push-pop.md renamed to ‎branches/try/src/doc/nomicon/vec-push-pop.md
diff --git a/‎branches/try/src/doc/tarpl/vec-raw.md renamed to ‎branches/try/src/doc/nomicon/vec-raw.md b/‎branches/try/src/doc/tarpl/vec-raw.md renamed to ‎branches/try/src/doc/nomicon/vec-raw.md
diff --git a/‎branches/try/src/doc/tarpl/vec-zsts.md renamed to ‎branches/try/src/doc/nomicon/vec-zsts.md b/‎branches/try/src/doc/tarpl/vec-zsts.md renamed to ‎branches/try/src/doc/nomicon/vec-zsts.md
diff --git a/‎branches/try/src/doc/tarpl/vec.md renamed to ‎branches/try/src/doc/nomicon/vec.md b/‎branches/try/src/doc/tarpl/vec.md renamed to ‎branches/try/src/doc/nomicon/vec.md
diff --git a/‎branches/try/src/doc/tarpl/working-with-unsafe.md renamed to ‎branches/try/src/doc/nomicon/working-with-unsafe.md b/‎branches/try/src/doc/tarpl/working-with-unsafe.md renamed to ‎branches/try/src/doc/nomicon/working-with-unsafe.md
diff --git a/‎branches/try/src/doc/reference.md
Lines changed: 2 additions & 2 deletions b/‎branches/try/src/doc/reference.md
Lines changed: 2 additions & 2 deletions
diff --git a/‎branches/try/src/doc/tarpl/README.md
Lines changed: 0 additions & 34 deletions b/‎branches/try/src/doc/tarpl/README.md
Lines changed: 0 additions & 34 deletions
diff --git a/‎branches/try/src/doc/trpl/guessing-game.md
Lines changed: 2 additions & 2 deletions b/‎branches/try/src/doc/trpl/guessing-game.md
Lines changed: 2 additions & 2 deletions
diff --git a/‎branches/try/src/doc/trpl/hello-cargo.md
Lines changed: 19 additions & 17 deletions b/‎branches/try/src/doc/trpl/hello-cargo.md
Lines changed: 19 additions & 17 deletions
diff --git a/‎branches/try/src/doc/trpl/lang-items.md
Lines changed: 1 addition & 0 deletions b/‎branches/try/src/doc/trpl/lang-items.md
Lines changed: 1 addition & 0 deletions
diff --git a/‎branches/try/src/doc/trpl/no-stdlib.md
Lines changed: 3 additions & 0 deletions b/‎branches/try/src/doc/trpl/no-stdlib.md
Lines changed: 3 additions & 0 deletions
diff --git a/‎branches/try/src/doc/trpl/patterns.md
Lines changed: 38 additions & 41 deletions b/‎branches/try/src/doc/trpl/patterns.md
Lines changed: 38 additions & 41 deletions
@@ -1,7 +1,7 @@
 ---
 refs/heads/master: aca2057ed5fb7af3f8905b2bc01f72fa001c35c8
 refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
-refs/heads/try: 549de0d47a7876e7ff4e2c664e816a9fbe758073
+refs/heads/try: 6be272cff53072fd2ba81e80da07ec653d10c51a
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 
@@ -77,7 +77,7 @@ ERR_IDX_GEN = $(RPATH_VAR2_T_$(CFG_BUILD)_H_$(CFG_BUILD)) $(ERR_IDX_GEN_EXE)
 
 D := $(S)src/doc
 
-DOC_TARGETS := trpl tarpl style error-index
+DOC_TARGETS := trpl nomicon style error-index
 COMPILER_DOC_TARGETS :=
 DOC_L10N_TARGETS :=
 
@@ -287,12 +287,12 @@ doc/book/index.html: $(RUSTBOOK_EXE) $(wildcard $(S)/src/doc/trpl/*.md) | doc/
 	$(Q)rm -rf doc/book
 	$(Q)$(RUSTBOOK) build $(S)src/doc/trpl doc/book
 
-tarpl: doc/adv-book/index.html
+nomicon: doc/nomicon/index.html
 
-doc/adv-book/index.html: $(RUSTBOOK_EXE) $(wildcard $(S)/src/doc/tarpl/*.md) | doc/
+doc/nomicon/index.html: $(RUSTBOOK_EXE) $(wildcard $(S)/src/doc/nomicon/*.md) | doc/
 	@$(call E, rustbook: $@)
-	$(Q)rm -rf doc/adv-book
-	$(Q)$(RUSTBOOK) build $(S)src/doc/tarpl doc/adv-book
+	$(Q)rm -rf doc/nomicon
+	$(Q)$(RUSTBOOK) build $(S)src/doc/nomicon doc/nomicon
 
 style: doc/style/index.html
 
 
@@ -162,8 +162,8 @@ $(foreach doc,$(DOCS), \
   $(eval $(call DOCTEST,md-$(doc),$(S)src/doc/$(doc).md)))
 $(foreach file,$(wildcard $(S)src/doc/trpl/*.md), \
   $(eval $(call DOCTEST,$(file:$(S)src/doc/trpl/%.md=trpl-%),$(file))))
-$(foreach file,$(wildcard $(S)src/doc/tarpl/*.md), \
-  $(eval $(call DOCTEST,$(file:$(S)src/doc/tarpl/%.md=tarpl-%),$(file))))
+$(foreach file,$(wildcard $(S)src/doc/nomicon/*.md), \
+  $(eval $(call DOCTEST,$(file:$(S)src/doc/nomicon/%.md=nomicon-%),$(file))))
 ######################################################################
 # Main test targets
 ######################################################################