Skip to content

Commit 547cdee

Browse files
committed
---
yaml --- r: 236222 b: refs/heads/stable c: ca902dd h: refs/heads/master v: v3
1 parent 6ef518f commit 547cdee

File tree

113 files changed

+631
-1441
lines changed

Some content is hidden

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

113 files changed

+631
-1441
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ refs/heads/tmp: afae2ff723393b3ab4ccffef6ac7c6d1809e2da0
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3030
refs/tags/homu-tmp: f859507de8c410b648d934d8f5ec1c52daac971d
3131
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
32-
refs/heads/stable: ebc3a87fb45b37e0016a0e85210b55fca97e2cdd
32+
refs/heads/stable: ca902dd8cba9e18eaa265edfaf7e06dacb85fe71
3333
refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
3434
refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
3535
refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/mk/docs.mk

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ ERR_IDX_GEN = $(RPATH_VAR2_T_$(CFG_BUILD)_H_$(CFG_BUILD)) $(ERR_IDX_GEN_EXE)
7777

7878
D := $(S)src/doc
7979

80-
DOC_TARGETS := trpl tarpl style error-index
80+
DOC_TARGETS := trpl nomicon style error-index
8181
COMPILER_DOC_TARGETS :=
8282
DOC_L10N_TARGETS :=
8383

@@ -287,12 +287,12 @@ doc/book/index.html: $(RUSTBOOK_EXE) $(wildcard $(S)/src/doc/trpl/*.md) | doc/
287287
$(Q)rm -rf doc/book
288288
$(Q)$(RUSTBOOK) build $(S)src/doc/trpl doc/book
289289

290-
tarpl: doc/adv-book/index.html
290+
nomicon: doc/nomicon/index.html
291291

292-
doc/adv-book/index.html: $(RUSTBOOK_EXE) $(wildcard $(S)/src/doc/tarpl/*.md) | doc/
292+
doc/nomicon/index.html: $(RUSTBOOK_EXE) $(wildcard $(S)/src/doc/nomicon/*.md) | doc/
293293
@$(call E, rustbook: $@)
294-
$(Q)rm -rf doc/adv-book
295-
$(Q)$(RUSTBOOK) build $(S)src/doc/tarpl doc/adv-book
294+
$(Q)rm -rf doc/nomicon
295+
$(Q)$(RUSTBOOK) build $(S)src/doc/nomicon doc/nomicon
296296

297297
style: doc/style/index.html
298298

branches/stable/mk/tests.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ $(foreach doc,$(DOCS), \
162162
$(eval $(call DOCTEST,md-$(doc),$(S)src/doc/$(doc).md)))
163163
$(foreach file,$(wildcard $(S)src/doc/trpl/*.md), \
164164
$(eval $(call DOCTEST,$(file:$(S)src/doc/trpl/%.md=trpl-%),$(file))))
165-
$(foreach file,$(wildcard $(S)src/doc/tarpl/*.md), \
166-
$(eval $(call DOCTEST,$(file:$(S)src/doc/tarpl/%.md=tarpl-%),$(file))))
165+
$(foreach file,$(wildcard $(S)src/doc/nomicon/*.md), \
166+
$(eval $(call DOCTEST,$(file:$(S)src/doc/nomicon/%.md=nomicon-%),$(file))))
167167
######################################################################
168168
# Main test targets
169169
######################################################################
Lines changed: 38 additions & 0 deletions

branches/stable/src/doc/reference.md

Lines changed: 2 additions & 2 deletions

branches/stable/src/doc/tarpl/README.md

Lines changed: 0 additions & 34 deletions
This file was deleted.

branches/stable/src/doc/trpl/SUMMARY.md

Lines changed: 2 additions & 1 deletion

branches/stable/src/doc/trpl/choosing-your-guarantees.md

Lines changed: 0 additions & 1 deletion
Lines changed: 85 additions & 0 deletions

branches/stable/src/doc/trpl/lang-items.md

Lines changed: 0 additions & 1 deletion

0 commit comments

Comments
 (0)