From 024aa9a345e92aa1926517c4d9b16bd83e74c10d Mon Sep 17 00:00:00 2001 From: Steve Klabnik Date: Thu, 19 Nov 2015 11:30:18 -0500 Subject: [PATCH] src/doc/trpl -> src/doc/book The book was located under 'src/doc/trpl' because originally, it was going to be hosted under that URL. Late in the game, before 1.0, we decided that /book was a better one, so we changed the output, but not the input. This causes confusion for no good reason. So we'll change the source directory to look like the output directory, like for every other thing in src/doc. --- mk/docs.mk | 8 ++++---- src/doc/{trpl => book}/README.md | 0 src/doc/{trpl => book}/SUMMARY.md | 0 src/doc/{trpl => book}/advanced-linking.md | 0 src/doc/{trpl => book}/associated-constants.md | 0 src/doc/{trpl => book}/associated-types.md | 0 src/doc/{trpl => book}/attributes.md | 0 src/doc/{trpl => book}/benchmark-tests.md | 0 src/doc/{trpl => book}/bibliography.md | 0 src/doc/{trpl => book}/borrow-and-asref.md | 0 src/doc/{trpl => book}/box-syntax-and-patterns.md | 0 src/doc/{trpl => book}/casting-between-types.md | 0 src/doc/{trpl => book}/choosing-your-guarantees.md | 0 src/doc/{trpl => book}/closures.md | 0 src/doc/{trpl => book}/comments.md | 0 src/doc/{trpl => book}/compiler-plugins.md | 0 src/doc/{trpl => book}/concurrency.md | 0 src/doc/{trpl => book}/conditional-compilation.md | 0 src/doc/{trpl => book}/const-and-static.md | 0 src/doc/{trpl => book}/crates-and-modules.md | 0 src/doc/{trpl => book}/custom-allocators.md | 0 src/doc/{trpl => book}/deref-coercions.md | 0 src/doc/{trpl => book}/dining-philosophers.md | 0 src/doc/{trpl => book}/documentation.md | 0 src/doc/{trpl => book}/drop.md | 0 src/doc/{trpl => book}/effective-rust.md | 0 src/doc/{trpl => book}/enums.md | 0 src/doc/{trpl => book}/error-handling.md | 0 src/doc/{trpl => book}/ffi.md | 0 src/doc/{trpl => book}/functions.md | 0 src/doc/{trpl => book}/generics.md | 0 src/doc/{trpl => book}/getting-started.md | 0 src/doc/{trpl => book}/glossary.md | 0 src/doc/{trpl => book}/guessing-game.md | 0 src/doc/{trpl => book}/if-let.md | 0 src/doc/{trpl => book}/if.md | 0 src/doc/{trpl => book}/inline-assembly.md | 0 src/doc/{trpl => book}/intrinsics.md | 0 src/doc/{trpl => book}/iterators.md | 0 src/doc/{trpl => book}/lang-items.md | 0 src/doc/{trpl => book}/learn-rust.md | 0 src/doc/{trpl => book}/lifetimes.md | 0 src/doc/{trpl => book}/loops.md | 0 src/doc/{trpl => book}/macros.md | 0 src/doc/{trpl => book}/match.md | 0 src/doc/{trpl => book}/method-syntax.md | 0 src/doc/{trpl => book}/mutability.md | 0 src/doc/{trpl => book}/nightly-rust.md | 0 src/doc/{trpl => book}/no-stdlib.md | 0 src/doc/{trpl => book}/operators-and-overloading.md | 0 src/doc/{trpl => book}/ownership.md | 0 src/doc/{trpl => book}/patterns.md | 0 src/doc/{trpl => book}/primitive-types.md | 0 src/doc/{trpl => book}/raw-pointers.md | 0 src/doc/{trpl => book}/references-and-borrowing.md | 0 src/doc/{trpl => book}/release-channels.md | 0 src/doc/{trpl => book}/rust-inside-other-languages.md | 0 src/doc/{trpl => book}/slice-patterns.md | 0 src/doc/{trpl => book}/strings.md | 0 src/doc/{trpl => book}/structs.md | 0 src/doc/{trpl => book}/syntax-and-semantics.md | 0 src/doc/{trpl => book}/syntax-index.md | 0 src/doc/{trpl => book}/testing.md | 0 src/doc/{trpl => book}/the-stack-and-the-heap.md | 0 src/doc/{trpl => book}/trait-objects.md | 0 src/doc/{trpl => book}/traits.md | 0 src/doc/{trpl => book}/type-aliases.md | 0 src/doc/{trpl => book}/ufcs.md | 0 src/doc/{trpl => book}/unsafe.md | 0 src/doc/{trpl => book}/unsized-types.md | 0 src/doc/{trpl => book}/variable-bindings.md | 0 src/doc/{trpl => book}/vectors.md | 0 72 files changed, 4 insertions(+), 4 deletions(-) rename src/doc/{trpl => book}/README.md (100%) rename src/doc/{trpl => book}/SUMMARY.md (100%) rename src/doc/{trpl => book}/advanced-linking.md (100%) rename src/doc/{trpl => book}/associated-constants.md (100%) rename src/doc/{trpl => book}/associated-types.md (100%) rename src/doc/{trpl => book}/attributes.md (100%) rename src/doc/{trpl => book}/benchmark-tests.md (100%) rename src/doc/{trpl => book}/bibliography.md (100%) rename src/doc/{trpl => book}/borrow-and-asref.md (100%) rename src/doc/{trpl => book}/box-syntax-and-patterns.md (100%) rename src/doc/{trpl => book}/casting-between-types.md (100%) rename src/doc/{trpl => book}/choosing-your-guarantees.md (100%) rename src/doc/{trpl => book}/closures.md (100%) rename src/doc/{trpl => book}/comments.md (100%) rename src/doc/{trpl => book}/compiler-plugins.md (100%) rename src/doc/{trpl => book}/concurrency.md (100%) rename src/doc/{trpl => book}/conditional-compilation.md (100%) rename src/doc/{trpl => book}/const-and-static.md (100%) rename src/doc/{trpl => book}/crates-and-modules.md (100%) rename src/doc/{trpl => book}/custom-allocators.md (100%) rename src/doc/{trpl => book}/deref-coercions.md (100%) rename src/doc/{trpl => book}/dining-philosophers.md (100%) rename src/doc/{trpl => book}/documentation.md (100%) rename src/doc/{trpl => book}/drop.md (100%) rename src/doc/{trpl => book}/effective-rust.md (100%) rename src/doc/{trpl => book}/enums.md (100%) rename src/doc/{trpl => book}/error-handling.md (100%) rename src/doc/{trpl => book}/ffi.md (100%) rename src/doc/{trpl => book}/functions.md (100%) rename src/doc/{trpl => book}/generics.md (100%) rename src/doc/{trpl => book}/getting-started.md (100%) rename src/doc/{trpl => book}/glossary.md (100%) rename src/doc/{trpl => book}/guessing-game.md (100%) rename src/doc/{trpl => book}/if-let.md (100%) rename src/doc/{trpl => book}/if.md (100%) rename src/doc/{trpl => book}/inline-assembly.md (100%) rename src/doc/{trpl => book}/intrinsics.md (100%) rename src/doc/{trpl => book}/iterators.md (100%) rename src/doc/{trpl => book}/lang-items.md (100%) rename src/doc/{trpl => book}/learn-rust.md (100%) rename src/doc/{trpl => book}/lifetimes.md (100%) rename src/doc/{trpl => book}/loops.md (100%) rename src/doc/{trpl => book}/macros.md (100%) rename src/doc/{trpl => book}/match.md (100%) rename src/doc/{trpl => book}/method-syntax.md (100%) rename src/doc/{trpl => book}/mutability.md (100%) rename src/doc/{trpl => book}/nightly-rust.md (100%) rename src/doc/{trpl => book}/no-stdlib.md (100%) rename src/doc/{trpl => book}/operators-and-overloading.md (100%) rename src/doc/{trpl => book}/ownership.md (100%) rename src/doc/{trpl => book}/patterns.md (100%) rename src/doc/{trpl => book}/primitive-types.md (100%) rename src/doc/{trpl => book}/raw-pointers.md (100%) rename src/doc/{trpl => book}/references-and-borrowing.md (100%) rename src/doc/{trpl => book}/release-channels.md (100%) rename src/doc/{trpl => book}/rust-inside-other-languages.md (100%) rename src/doc/{trpl => book}/slice-patterns.md (100%) rename src/doc/{trpl => book}/strings.md (100%) rename src/doc/{trpl => book}/structs.md (100%) rename src/doc/{trpl => book}/syntax-and-semantics.md (100%) rename src/doc/{trpl => book}/syntax-index.md (100%) rename src/doc/{trpl => book}/testing.md (100%) rename src/doc/{trpl => book}/the-stack-and-the-heap.md (100%) rename src/doc/{trpl => book}/trait-objects.md (100%) rename src/doc/{trpl => book}/traits.md (100%) rename src/doc/{trpl => book}/type-aliases.md (100%) rename src/doc/{trpl => book}/ufcs.md (100%) rename src/doc/{trpl => book}/unsafe.md (100%) rename src/doc/{trpl => book}/unsized-types.md (100%) rename src/doc/{trpl => book}/variable-bindings.md (100%) rename src/doc/{trpl => book}/vectors.md (100%) diff --git a/mk/docs.mk b/mk/docs.mk index b0872c88c141a..f76368e3d0b86 100644 --- a/mk/docs.mk +++ b/mk/docs.mk @@ -65,7 +65,7 @@ ERR_IDX_GEN = $(RPATH_VAR2_T_$(CFG_BUILD)_H_$(CFG_BUILD)) $(ERR_IDX_GEN_EXE) D := $(S)src/doc -DOC_TARGETS := trpl nomicon style error-index +DOC_TARGETS := book nomicon style error-index COMPILER_DOC_TARGETS := DOC_L10N_TARGETS := @@ -194,12 +194,12 @@ docs: $(DOC_TARGETS) doc: docs compiler-docs: $(COMPILER_DOC_TARGETS) -trpl: doc/book/index.html +book: doc/book/index.html -doc/book/index.html: $(RUSTBOOK_EXE) $(wildcard $(S)/src/doc/trpl/*.md) | doc/ +doc/book/index.html: $(RUSTBOOK_EXE) $(wildcard $(S)/src/doc/book/*.md) | doc/ @$(call E, rustbook: $@) $(Q)rm -rf doc/book - $(Q)$(RUSTBOOK) build $(S)src/doc/trpl doc/book + $(Q)$(RUSTBOOK) build $(S)src/doc/book doc/book nomicon: doc/nomicon/index.html diff --git a/src/doc/trpl/README.md b/src/doc/book/README.md similarity index 100% rename from src/doc/trpl/README.md rename to src/doc/book/README.md diff --git a/src/doc/trpl/SUMMARY.md b/src/doc/book/SUMMARY.md similarity index 100% rename from src/doc/trpl/SUMMARY.md rename to src/doc/book/SUMMARY.md diff --git a/src/doc/trpl/advanced-linking.md b/src/doc/book/advanced-linking.md similarity index 100% rename from src/doc/trpl/advanced-linking.md rename to src/doc/book/advanced-linking.md diff --git a/src/doc/trpl/associated-constants.md b/src/doc/book/associated-constants.md similarity index 100% rename from src/doc/trpl/associated-constants.md rename to src/doc/book/associated-constants.md diff --git a/src/doc/trpl/associated-types.md b/src/doc/book/associated-types.md similarity index 100% rename from src/doc/trpl/associated-types.md rename to src/doc/book/associated-types.md diff --git a/src/doc/trpl/attributes.md b/src/doc/book/attributes.md similarity index 100% rename from src/doc/trpl/attributes.md rename to src/doc/book/attributes.md diff --git a/src/doc/trpl/benchmark-tests.md b/src/doc/book/benchmark-tests.md similarity index 100% rename from src/doc/trpl/benchmark-tests.md rename to src/doc/book/benchmark-tests.md diff --git a/src/doc/trpl/bibliography.md b/src/doc/book/bibliography.md similarity index 100% rename from src/doc/trpl/bibliography.md rename to src/doc/book/bibliography.md diff --git a/src/doc/trpl/borrow-and-asref.md b/src/doc/book/borrow-and-asref.md similarity index 100% rename from src/doc/trpl/borrow-and-asref.md rename to src/doc/book/borrow-and-asref.md diff --git a/src/doc/trpl/box-syntax-and-patterns.md b/src/doc/book/box-syntax-and-patterns.md similarity index 100% rename from src/doc/trpl/box-syntax-and-patterns.md rename to src/doc/book/box-syntax-and-patterns.md diff --git a/src/doc/trpl/casting-between-types.md b/src/doc/book/casting-between-types.md similarity index 100% rename from src/doc/trpl/casting-between-types.md rename to src/doc/book/casting-between-types.md diff --git a/src/doc/trpl/choosing-your-guarantees.md b/src/doc/book/choosing-your-guarantees.md similarity index 100% rename from src/doc/trpl/choosing-your-guarantees.md rename to src/doc/book/choosing-your-guarantees.md diff --git a/src/doc/trpl/closures.md b/src/doc/book/closures.md similarity index 100% rename from src/doc/trpl/closures.md rename to src/doc/book/closures.md diff --git a/src/doc/trpl/comments.md b/src/doc/book/comments.md similarity index 100% rename from src/doc/trpl/comments.md rename to src/doc/book/comments.md diff --git a/src/doc/trpl/compiler-plugins.md b/src/doc/book/compiler-plugins.md similarity index 100% rename from src/doc/trpl/compiler-plugins.md rename to src/doc/book/compiler-plugins.md diff --git a/src/doc/trpl/concurrency.md b/src/doc/book/concurrency.md similarity index 100% rename from src/doc/trpl/concurrency.md rename to src/doc/book/concurrency.md diff --git a/src/doc/trpl/conditional-compilation.md b/src/doc/book/conditional-compilation.md similarity index 100% rename from src/doc/trpl/conditional-compilation.md rename to src/doc/book/conditional-compilation.md diff --git a/src/doc/trpl/const-and-static.md b/src/doc/book/const-and-static.md similarity index 100% rename from src/doc/trpl/const-and-static.md rename to src/doc/book/const-and-static.md diff --git a/src/doc/trpl/crates-and-modules.md b/src/doc/book/crates-and-modules.md similarity index 100% rename from src/doc/trpl/crates-and-modules.md rename to src/doc/book/crates-and-modules.md diff --git a/src/doc/trpl/custom-allocators.md b/src/doc/book/custom-allocators.md similarity index 100% rename from src/doc/trpl/custom-allocators.md rename to src/doc/book/custom-allocators.md diff --git a/src/doc/trpl/deref-coercions.md b/src/doc/book/deref-coercions.md similarity index 100% rename from src/doc/trpl/deref-coercions.md rename to src/doc/book/deref-coercions.md diff --git a/src/doc/trpl/dining-philosophers.md b/src/doc/book/dining-philosophers.md similarity index 100% rename from src/doc/trpl/dining-philosophers.md rename to src/doc/book/dining-philosophers.md diff --git a/src/doc/trpl/documentation.md b/src/doc/book/documentation.md similarity index 100% rename from src/doc/trpl/documentation.md rename to src/doc/book/documentation.md diff --git a/src/doc/trpl/drop.md b/src/doc/book/drop.md similarity index 100% rename from src/doc/trpl/drop.md rename to src/doc/book/drop.md diff --git a/src/doc/trpl/effective-rust.md b/src/doc/book/effective-rust.md similarity index 100% rename from src/doc/trpl/effective-rust.md rename to src/doc/book/effective-rust.md diff --git a/src/doc/trpl/enums.md b/src/doc/book/enums.md similarity index 100% rename from src/doc/trpl/enums.md rename to src/doc/book/enums.md diff --git a/src/doc/trpl/error-handling.md b/src/doc/book/error-handling.md similarity index 100% rename from src/doc/trpl/error-handling.md rename to src/doc/book/error-handling.md diff --git a/src/doc/trpl/ffi.md b/src/doc/book/ffi.md similarity index 100% rename from src/doc/trpl/ffi.md rename to src/doc/book/ffi.md diff --git a/src/doc/trpl/functions.md b/src/doc/book/functions.md similarity index 100% rename from src/doc/trpl/functions.md rename to src/doc/book/functions.md diff --git a/src/doc/trpl/generics.md b/src/doc/book/generics.md similarity index 100% rename from src/doc/trpl/generics.md rename to src/doc/book/generics.md diff --git a/src/doc/trpl/getting-started.md b/src/doc/book/getting-started.md similarity index 100% rename from src/doc/trpl/getting-started.md rename to src/doc/book/getting-started.md diff --git a/src/doc/trpl/glossary.md b/src/doc/book/glossary.md similarity index 100% rename from src/doc/trpl/glossary.md rename to src/doc/book/glossary.md diff --git a/src/doc/trpl/guessing-game.md b/src/doc/book/guessing-game.md similarity index 100% rename from src/doc/trpl/guessing-game.md rename to src/doc/book/guessing-game.md diff --git a/src/doc/trpl/if-let.md b/src/doc/book/if-let.md similarity index 100% rename from src/doc/trpl/if-let.md rename to src/doc/book/if-let.md diff --git a/src/doc/trpl/if.md b/src/doc/book/if.md similarity index 100% rename from src/doc/trpl/if.md rename to src/doc/book/if.md diff --git a/src/doc/trpl/inline-assembly.md b/src/doc/book/inline-assembly.md similarity index 100% rename from src/doc/trpl/inline-assembly.md rename to src/doc/book/inline-assembly.md diff --git a/src/doc/trpl/intrinsics.md b/src/doc/book/intrinsics.md similarity index 100% rename from src/doc/trpl/intrinsics.md rename to src/doc/book/intrinsics.md diff --git a/src/doc/trpl/iterators.md b/src/doc/book/iterators.md similarity index 100% rename from src/doc/trpl/iterators.md rename to src/doc/book/iterators.md diff --git a/src/doc/trpl/lang-items.md b/src/doc/book/lang-items.md similarity index 100% rename from src/doc/trpl/lang-items.md rename to src/doc/book/lang-items.md diff --git a/src/doc/trpl/learn-rust.md b/src/doc/book/learn-rust.md similarity index 100% rename from src/doc/trpl/learn-rust.md rename to src/doc/book/learn-rust.md diff --git a/src/doc/trpl/lifetimes.md b/src/doc/book/lifetimes.md similarity index 100% rename from src/doc/trpl/lifetimes.md rename to src/doc/book/lifetimes.md diff --git a/src/doc/trpl/loops.md b/src/doc/book/loops.md similarity index 100% rename from src/doc/trpl/loops.md rename to src/doc/book/loops.md diff --git a/src/doc/trpl/macros.md b/src/doc/book/macros.md similarity index 100% rename from src/doc/trpl/macros.md rename to src/doc/book/macros.md diff --git a/src/doc/trpl/match.md b/src/doc/book/match.md similarity index 100% rename from src/doc/trpl/match.md rename to src/doc/book/match.md diff --git a/src/doc/trpl/method-syntax.md b/src/doc/book/method-syntax.md similarity index 100% rename from src/doc/trpl/method-syntax.md rename to src/doc/book/method-syntax.md diff --git a/src/doc/trpl/mutability.md b/src/doc/book/mutability.md similarity index 100% rename from src/doc/trpl/mutability.md rename to src/doc/book/mutability.md diff --git a/src/doc/trpl/nightly-rust.md b/src/doc/book/nightly-rust.md similarity index 100% rename from src/doc/trpl/nightly-rust.md rename to src/doc/book/nightly-rust.md diff --git a/src/doc/trpl/no-stdlib.md b/src/doc/book/no-stdlib.md similarity index 100% rename from src/doc/trpl/no-stdlib.md rename to src/doc/book/no-stdlib.md diff --git a/src/doc/trpl/operators-and-overloading.md b/src/doc/book/operators-and-overloading.md similarity index 100% rename from src/doc/trpl/operators-and-overloading.md rename to src/doc/book/operators-and-overloading.md diff --git a/src/doc/trpl/ownership.md b/src/doc/book/ownership.md similarity index 100% rename from src/doc/trpl/ownership.md rename to src/doc/book/ownership.md diff --git a/src/doc/trpl/patterns.md b/src/doc/book/patterns.md similarity index 100% rename from src/doc/trpl/patterns.md rename to src/doc/book/patterns.md diff --git a/src/doc/trpl/primitive-types.md b/src/doc/book/primitive-types.md similarity index 100% rename from src/doc/trpl/primitive-types.md rename to src/doc/book/primitive-types.md diff --git a/src/doc/trpl/raw-pointers.md b/src/doc/book/raw-pointers.md similarity index 100% rename from src/doc/trpl/raw-pointers.md rename to src/doc/book/raw-pointers.md diff --git a/src/doc/trpl/references-and-borrowing.md b/src/doc/book/references-and-borrowing.md similarity index 100% rename from src/doc/trpl/references-and-borrowing.md rename to src/doc/book/references-and-borrowing.md diff --git a/src/doc/trpl/release-channels.md b/src/doc/book/release-channels.md similarity index 100% rename from src/doc/trpl/release-channels.md rename to src/doc/book/release-channels.md diff --git a/src/doc/trpl/rust-inside-other-languages.md b/src/doc/book/rust-inside-other-languages.md similarity index 100% rename from src/doc/trpl/rust-inside-other-languages.md rename to src/doc/book/rust-inside-other-languages.md diff --git a/src/doc/trpl/slice-patterns.md b/src/doc/book/slice-patterns.md similarity index 100% rename from src/doc/trpl/slice-patterns.md rename to src/doc/book/slice-patterns.md diff --git a/src/doc/trpl/strings.md b/src/doc/book/strings.md similarity index 100% rename from src/doc/trpl/strings.md rename to src/doc/book/strings.md diff --git a/src/doc/trpl/structs.md b/src/doc/book/structs.md similarity index 100% rename from src/doc/trpl/structs.md rename to src/doc/book/structs.md diff --git a/src/doc/trpl/syntax-and-semantics.md b/src/doc/book/syntax-and-semantics.md similarity index 100% rename from src/doc/trpl/syntax-and-semantics.md rename to src/doc/book/syntax-and-semantics.md diff --git a/src/doc/trpl/syntax-index.md b/src/doc/book/syntax-index.md similarity index 100% rename from src/doc/trpl/syntax-index.md rename to src/doc/book/syntax-index.md diff --git a/src/doc/trpl/testing.md b/src/doc/book/testing.md similarity index 100% rename from src/doc/trpl/testing.md rename to src/doc/book/testing.md diff --git a/src/doc/trpl/the-stack-and-the-heap.md b/src/doc/book/the-stack-and-the-heap.md similarity index 100% rename from src/doc/trpl/the-stack-and-the-heap.md rename to src/doc/book/the-stack-and-the-heap.md diff --git a/src/doc/trpl/trait-objects.md b/src/doc/book/trait-objects.md similarity index 100% rename from src/doc/trpl/trait-objects.md rename to src/doc/book/trait-objects.md diff --git a/src/doc/trpl/traits.md b/src/doc/book/traits.md similarity index 100% rename from src/doc/trpl/traits.md rename to src/doc/book/traits.md diff --git a/src/doc/trpl/type-aliases.md b/src/doc/book/type-aliases.md similarity index 100% rename from src/doc/trpl/type-aliases.md rename to src/doc/book/type-aliases.md diff --git a/src/doc/trpl/ufcs.md b/src/doc/book/ufcs.md similarity index 100% rename from src/doc/trpl/ufcs.md rename to src/doc/book/ufcs.md diff --git a/src/doc/trpl/unsafe.md b/src/doc/book/unsafe.md similarity index 100% rename from src/doc/trpl/unsafe.md rename to src/doc/book/unsafe.md diff --git a/src/doc/trpl/unsized-types.md b/src/doc/book/unsized-types.md similarity index 100% rename from src/doc/trpl/unsized-types.md rename to src/doc/book/unsized-types.md diff --git a/src/doc/trpl/variable-bindings.md b/src/doc/book/variable-bindings.md similarity index 100% rename from src/doc/trpl/variable-bindings.md rename to src/doc/book/variable-bindings.md diff --git a/src/doc/trpl/vectors.md b/src/doc/book/vectors.md similarity index 100% rename from src/doc/trpl/vectors.md rename to src/doc/book/vectors.md