Skip to content

Commit 3e8a4a0

Browse files
committed
auto merge of #11488 : kballard/rust/librustpkg-docs, r=brson
2 parents c3c94ad + d76ce5f commit 3e8a4a0

File tree

3 files changed

+26
-20
lines changed

3 files changed

+26
-20
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ src/.DS_Store
8080
/doc/rustc
8181
/doc/syntax
8282
/doc/rustuv
83+
/doc/rustpkg
8384
/nd/
8485
/llvm/
8586
version.md

doc/index.md

+22-19
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,33 @@
66
.header-section-number { display: none; }
77
</style>
88

9-
[The Rust tutorial](tutorial.html) ([PDF](tutorial.pdf))
10-
[The Rust reference manual](rust.html) ([PDF](rust.pdf))
9+
[The Rust tutorial](tutorial.html) ([PDF](tutorial.pdf))
10+
[The Rust reference manual](rust.html) ([PDF](rust.pdf))
1111

1212
# Guides
1313

14-
[Pointers](guide-pointers.html)
15-
[References and Lifetimes](guide-lifetimes.html)
16-
[Containers and Iterators](guide-container.html)
17-
[Tasks and Communication](guide-tasks.html)
18-
[Foreign Function Interface](guide-ffi.html)
19-
[Macros](guide-macros.html)
20-
[Packaging](guide-rustpkg.html)
21-
[Testing](guide-testing.html)
14+
[Pointers](guide-pointers.html)
15+
[References and Lifetimes](guide-lifetimes.html)
16+
[Containers and Iterators](guide-container.html)
17+
[Tasks and Communication](guide-tasks.html)
18+
[Foreign Function Interface](guide-ffi.html)
19+
[Macros](guide-macros.html)
20+
[Packaging](guide-rustpkg.html)
21+
[Testing](guide-testing.html)
2222
[Conditions](guide-conditions.html)
2323

2424
# Libraries
2525

26-
[The standard library, `libstd`](std/index.html)
26+
[The standard library, `libstd`](std/index.html)
2727
[The extra library, `libextra`](extra/index.html)
2828

29-
[The M:N runtime library, `libgreen`](green/index.html)
29+
[The M:N runtime library, `libgreen`](green/index.html)
3030
[The 1:1 runtime library, `libnative`](native/index.html)
3131

32-
[The Rust parser, `libsyntax`](syntax/index.html)
32+
[The Rust libuv library, `librustuv`](rustuv/index.html)
33+
[The Rust packaging library, `librustpkg`](rustpkg/index.html)
34+
35+
[The Rust parser, `libsyntax`](syntax/index.html)
3336
[The Rust compiler, `librustc`](rustc/index.html)
3437

3538
# Tooling
@@ -38,14 +41,14 @@
3841

3942
# FAQs
4043

41-
[Language FAQ](complement-lang-faq.html)
42-
[Project FAQ](complement-project-faq.html)
43-
[Usage FAQ](complement-usage-faq.html)
44-
[Code cheatsheet](complement-cheatsheet.html) - "How do I do X?"
44+
[Language FAQ](complement-lang-faq.html)
45+
[Project FAQ](complement-project-faq.html)
46+
[Usage FAQ](complement-usage-faq.html)
47+
[Code cheatsheet](complement-cheatsheet.html) - "How do I do X?"
4548
[How to submit a bug report](complement-bugreport.html)
4649

4750
# External resources
4851

49-
The Rust [IRC channel](http://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust) - `#rust` on irc.mozilla.org
50-
The Rust community on [Reddit](http://reddit.com/r/rust)
52+
The Rust [IRC channel](http://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust) - `#rust` on irc.mozilla.org
53+
The Rust community on [Reddit](http://reddit.com/r/rust)
5154
The Rust [wiki](http://github.com/mozilla/rust/wiki)

mk/docs.mk

+3-1
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,8 @@ RUSTDOC = $(HBIN2_H_$(CFG_BUILD))/rustdoc$(X_$(CFG_BUILD))
289289
#
290290
# Passes --cfg stage2 to rustdoc because it uses the stage2 librustc.
291291
define libdoc
292-
doc/$(1)/index.html: $$(RUSTDOC) $$(TLIB2_T_$(3)_H_$(3))/$(CFG_STDLIB_$(3))
292+
doc/$(1)/index.html: $$(RUSTDOC) $$(TLIB2_T_$(3)_H_$(3))/$(CFG_STDLIB_$(3)) \
293+
$(foreach name,$(4),$$(TLIB2_T_$(3)_H_$(3))/$$(CFG_$(name)_$(3)))
293294
@$$(call E, rustdoc: $$@)
294295
$(Q)$(RUSTDOC) --cfg stage2 $(2)
295296

@@ -309,6 +310,7 @@ $(eval $(call libdoc,extra,$(EXTRALIB_CRATE),$(CFG_BUILD)))
309310
$(eval $(call libdoc,native,$(LIBNATIVE_CRATE),$(CFG_BUILD)))
310311
$(eval $(call libdoc,green,$(LIBGREEN_CRATE),$(CFG_BUILD)))
311312
$(eval $(call libdoc,rustuv,$(LIBRUSTUV_CRATE),$(CFG_BUILD)))
313+
$(eval $(call libdoc,rustpkg,$(RUSTPKG_LIB),$(CFG_BUILD),EXTRALIB LIBRUSTC))
312314

313315
$(eval $(call compiledoc,rustc,$(COMPILER_CRATE),$(CFG_BUILD)))
314316
$(eval $(call compiledoc,syntax,$(LIBSYNTAX_CRATE),$(CFG_BUILD)))

0 commit comments

Comments
 (0)