Skip to content

Commit 62f1d68

Browse files
committed
auto merge of #12747 : huonw/rust/rustdoc-markdown, r=alexcrichton
This gives Rustdoc the ability to render our guides, tutorial and manual and modifies the those documents (minor modifications) and makefiles to achieve this. See commits for more details (especially the makefile rewrite).
2 parents e959c87 + b4815ad commit 62f1d68

22 files changed

+1035
-679
lines changed

mk/clean.mk

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ clean-misc:
4141
@$(call E, cleaning)
4242
$(Q)rm -f $(RUNTIME_OBJS) $(RUNTIME_DEF)
4343
$(Q)rm -f $(RUSTLLVM_LIB_OBJS) $(RUSTLLVM_OBJS_OBJS) $(RUSTLLVM_DEF)
44-
$(Q)rm -Rf $(DOCS)
4544
$(Q)rm -Rf $(GENERATED)
4645
$(Q)rm -Rf tmp/*
4746
$(Q)rm -Rf rust-stage0-*.tar.bz2 $(PKG_NAME)-*.tar.gz $(PKG_NAME)-*.exe dist

mk/crates.mk

+1
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ TOOL_SOURCE_rustc := $(S)src/driver/driver.rs
9292
################################################################################
9393

9494
DOC_CRATES := $(filter-out rustc, $(filter-out syntax, $(CRATES)))
95+
COMPILER_DOC_CRATES := rustc syntax
9596

9697
# This macro creates some simple definitions for each crate being built, just
9798
# some munging of all of the parameters above.

0 commit comments

Comments
 (0)