diff options
| author | bors <bors@rust-lang.org> | 2014-12-29 20:19:53 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-12-29 20:19:53 +0000 |
| commit | 71123902e17ad339649f33423995eac78da40e3c (patch) | |
| tree | 24e266c560be671285c0d7a8e5f59d5da716a350 | |
| parent | 19f73b4ef6fb1d24f19738a8665889396fc1b0c8 (diff) | |
| parent | 48048419b10857d487b2580914e40a431d65fd1d (diff) | |
auto merge of #20101 : alexcrichton/rust/issue-20096, r=aturon
These crates are all deprecated for their rust-lang/$crate equivalents and by generating docs we're generating broken links. The documentation for these crates are generated out-of-tree and are managed separately, so we're not losing the documentation altogether, just the links from the main distribution's docs. Closes #20096
| -rw-r--r-- | mk/crates.mk | 7 | ||||
| -rw-r--r-- | mk/docs.mk | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/mk/crates.mk b/mk/crates.mk index e20cb06e3a8..c3b31e60f19 100644 --- a/mk/crates.mk +++ b/mk/crates.mk @@ -122,7 +122,12 @@ DOC_CRATES := $(filter-out rustc, \ $(filter-out rustc_borrowck, \ $(filter-out rustc_resolve, \ $(filter-out rustc_driver, \ - $(filter-out syntax, $(CRATES)))))))) + $(filter-out log, \ + $(filter-out regex, \ + $(filter-out regex_macros, \ + $(filter-out getopts, \ + $(filter-out time, \ + $(filter-out syntax, $(CRATES))))))))))))) COMPILER_DOC_CRATES := rustc rustc_trans rustc_borrowck rustc_resolve \ rustc_typeck rustc_driver syntax diff --git a/mk/docs.mk b/mk/docs.mk index 9a924916ec8..2a7ef5164f0 100644 --- a/mk/docs.mk +++ b/mk/docs.mk @@ -236,7 +236,8 @@ LIB_DOC_DEP_$(1) = \ $$(RSINPUTS_$(1)) \ $$(RUSTDOC_EXE) \ $$(foreach dep,$$(RUST_DEPS_$(1)), \ - $$(TLIB2_T_$(CFG_BUILD)_H_$(CFG_BUILD))/stamp.$$(dep) \ + $$(TLIB2_T_$(CFG_BUILD)_H_$(CFG_BUILD))/stamp.$$(dep)) \ + $$(foreach dep,$$(filter $$(DOC_CRATES), $$(RUST_DEPS_$(1))), \ doc/$$(dep)/) else LIB_DOC_DEP_$(1) = $$(CRATEFILE_$(1)) $$(RSINPUTS_$(1)) |