Skip to content

Commit 024aa9a

Browse files
steveklabniksteveklabnik
committed
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.
1 parent 3e48b0e commit 024aa9a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+4
-4
lines changed

‎mk/docs.mk

+4-4
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ ERR_IDX_GEN = $(RPATH_VAR2_T_$(CFG_BUILD)_H_$(CFG_BUILD)) $(ERR_IDX_GEN_EXE)
6565

6666
D := $(S)src/doc
6767

68-
DOC_TARGETS := trpl nomicon style error-index
68+
DOC_TARGETS := book nomicon style error-index
6969
COMPILER_DOC_TARGETS :=
7070
DOC_L10N_TARGETS :=
7171

@@ -194,12 +194,12 @@ docs: $(DOC_TARGETS)
194194
doc: docs
195195
compiler-docs: $(COMPILER_DOC_TARGETS)
196196

197-
trpl: doc/book/index.html
197+
book: doc/book/index.html
198198

199-
doc/book/index.html: $(RUSTBOOK_EXE) $(wildcard $(S)/src/doc/trpl/*.md) | doc/
199+
doc/book/index.html: $(RUSTBOOK_EXE) $(wildcard $(S)/src/doc/book/*.md) | doc/
200200
@$(call E, rustbook: $@)
201201
$(Q)rm -rf doc/book
202-
$(Q)$(RUSTBOOK) build $(S)src/doc/trpl doc/book
202+
$(Q)$(RUSTBOOK) build $(S)src/doc/book doc/book
203203

204204
nomicon: doc/nomicon/index.html
205205

‎src/doc/trpl/README.md ‎src/doc/book/README.md

‎src/doc/trpl/SUMMARY.md ‎src/doc/book/SUMMARY.md

‎src/doc/trpl/advanced-linking.md ‎src/doc/book/advanced-linking.md

‎src/doc/trpl/associated-constants.md ‎src/doc/book/associated-constants.md

‎src/doc/trpl/associated-types.md ‎src/doc/book/associated-types.md

‎src/doc/trpl/attributes.md ‎src/doc/book/attributes.md

‎src/doc/trpl/benchmark-tests.md ‎src/doc/book/benchmark-tests.md

‎src/doc/trpl/bibliography.md ‎src/doc/book/bibliography.md

‎src/doc/trpl/borrow-and-asref.md ‎src/doc/book/borrow-and-asref.md

‎src/doc/trpl/box-syntax-and-patterns.md ‎src/doc/book/box-syntax-and-patterns.md

‎src/doc/trpl/casting-between-types.md ‎src/doc/book/casting-between-types.md

‎src/doc/trpl/choosing-your-guarantees.md ‎src/doc/book/choosing-your-guarantees.md

‎src/doc/trpl/closures.md ‎src/doc/book/closures.md

‎src/doc/trpl/comments.md ‎src/doc/book/comments.md

‎src/doc/trpl/compiler-plugins.md ‎src/doc/book/compiler-plugins.md

‎src/doc/trpl/concurrency.md ‎src/doc/book/concurrency.md

‎src/doc/trpl/conditional-compilation.md ‎src/doc/book/conditional-compilation.md

‎src/doc/trpl/const-and-static.md ‎src/doc/book/const-and-static.md

‎src/doc/trpl/crates-and-modules.md ‎src/doc/book/crates-and-modules.md

‎src/doc/trpl/custom-allocators.md ‎src/doc/book/custom-allocators.md

‎src/doc/trpl/deref-coercions.md ‎src/doc/book/deref-coercions.md

‎src/doc/trpl/dining-philosophers.md ‎src/doc/book/dining-philosophers.md

‎src/doc/trpl/documentation.md ‎src/doc/book/documentation.md

‎src/doc/trpl/drop.md ‎src/doc/book/drop.md

‎src/doc/trpl/effective-rust.md ‎src/doc/book/effective-rust.md

‎src/doc/trpl/enums.md ‎src/doc/book/enums.md

‎src/doc/trpl/error-handling.md ‎src/doc/book/error-handling.md

‎src/doc/trpl/ffi.md ‎src/doc/book/ffi.md

‎src/doc/trpl/functions.md ‎src/doc/book/functions.md

‎src/doc/trpl/generics.md ‎src/doc/book/generics.md

‎src/doc/trpl/getting-started.md ‎src/doc/book/getting-started.md

‎src/doc/trpl/glossary.md ‎src/doc/book/glossary.md

‎src/doc/trpl/guessing-game.md ‎src/doc/book/guessing-game.md

‎src/doc/trpl/if-let.md ‎src/doc/book/if-let.md

‎src/doc/trpl/if.md ‎src/doc/book/if.md

‎src/doc/trpl/inline-assembly.md ‎src/doc/book/inline-assembly.md

‎src/doc/trpl/intrinsics.md ‎src/doc/book/intrinsics.md

‎src/doc/trpl/iterators.md ‎src/doc/book/iterators.md

‎src/doc/trpl/lang-items.md ‎src/doc/book/lang-items.md

‎src/doc/trpl/learn-rust.md ‎src/doc/book/learn-rust.md

‎src/doc/trpl/lifetimes.md ‎src/doc/book/lifetimes.md

‎src/doc/trpl/loops.md ‎src/doc/book/loops.md

‎src/doc/trpl/macros.md ‎src/doc/book/macros.md

‎src/doc/trpl/match.md ‎src/doc/book/match.md

‎src/doc/trpl/method-syntax.md ‎src/doc/book/method-syntax.md

‎src/doc/trpl/mutability.md ‎src/doc/book/mutability.md

‎src/doc/trpl/nightly-rust.md ‎src/doc/book/nightly-rust.md

‎src/doc/trpl/no-stdlib.md ‎src/doc/book/no-stdlib.md

‎src/doc/trpl/operators-and-overloading.md ‎src/doc/book/operators-and-overloading.md

‎src/doc/trpl/ownership.md ‎src/doc/book/ownership.md

‎src/doc/trpl/patterns.md ‎src/doc/book/patterns.md

‎src/doc/trpl/primitive-types.md ‎src/doc/book/primitive-types.md

‎src/doc/trpl/raw-pointers.md ‎src/doc/book/raw-pointers.md

‎src/doc/trpl/references-and-borrowing.md ‎src/doc/book/references-and-borrowing.md

‎src/doc/trpl/release-channels.md ‎src/doc/book/release-channels.md

‎src/doc/trpl/rust-inside-other-languages.md ‎src/doc/book/rust-inside-other-languages.md

‎src/doc/trpl/slice-patterns.md ‎src/doc/book/slice-patterns.md

‎src/doc/trpl/strings.md ‎src/doc/book/strings.md

‎src/doc/trpl/structs.md ‎src/doc/book/structs.md

‎src/doc/trpl/syntax-and-semantics.md ‎src/doc/book/syntax-and-semantics.md

‎src/doc/trpl/syntax-index.md ‎src/doc/book/syntax-index.md

‎src/doc/trpl/testing.md ‎src/doc/book/testing.md

‎src/doc/trpl/the-stack-and-the-heap.md ‎src/doc/book/the-stack-and-the-heap.md

‎src/doc/trpl/trait-objects.md ‎src/doc/book/trait-objects.md

‎src/doc/trpl/traits.md ‎src/doc/book/traits.md

‎src/doc/trpl/type-aliases.md ‎src/doc/book/type-aliases.md

‎src/doc/trpl/ufcs.md ‎src/doc/book/ufcs.md

‎src/doc/trpl/unsafe.md ‎src/doc/book/unsafe.md

‎src/doc/trpl/unsized-types.md ‎src/doc/book/unsized-types.md

‎src/doc/trpl/variable-bindings.md ‎src/doc/book/variable-bindings.md

‎src/doc/trpl/vectors.md ‎src/doc/book/vectors.md

0 commit comments

Comments
 (0)