Skip to content

Commit 18151f4

Browse files
baroslbarosl
committed
---
yaml --- r: 175067 b: refs/heads/master c: 5b57aa7 h: refs/heads/master i: 175065: 0d69c66 175063: 2e1595b v: v3
1 parent 9bd2ae9 commit 18151f4

File tree

136 files changed

+1932
-831
lines changed

Some content is hidden

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

136 files changed

+1932
-831
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: c1660174454d5baccf10efdc9bf634624ee18ff5
2+
refs/heads/master: 5b57aa757b70bae7d7014a677ff80aaf5d89fdb8
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 777435990e0e91df6b72ce80c9b6fa485eeb5daa
55
refs/heads/try: 08f6380a9f0b866796080094f44fe25ea5636547

‎trunk/man/rustdoc.1

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,27 @@ space-separated list of plugins to run (default: '')
3535
--plugin-path <val>
3636
directory to load plugins from (default: /tmp/rustdoc_ng/plugins)
3737
.TP
38+
--target <val>
39+
target triple to document
40+
.TP
41+
--crate-name <val>
42+
specify the name of this crate
43+
.TP
3844
-L --library-path <val>
3945
directory to add to crate search path
4046
.TP
47+
--cfg <val>
48+
pass a --cfg to rustc
49+
.TP
50+
--extern <val>
51+
pass an --extern to rustc
52+
.TP
53+
--test
54+
run code examples as tests
55+
.TP
56+
--test-args <val>
57+
pass arguments to the test runner
58+
.TP
4159
--html-in-header <val>
4260
file to add to <head>
4361
.TP
@@ -47,8 +65,20 @@ file to add in <body>, before content
4765
--html-after-content <val>
4866
file to add in <body>, after content
4967
.TP
68+
--markdown-css <val>
69+
CSS files to include via <link> in a rendered Markdown file
70+
.TP
71+
--markdown-playground-url <val>
72+
URL to send code snippets to
73+
.TP
74+
--markdown-no-toc
75+
don't include table of contents
76+
.TP
5077
-h, --help
5178
Print help
79+
.TP
80+
-V, --version
81+
Print rustdoc's version
5282

5383
.SH "OUTPUT FORMATS"
5484

‎trunk/mk/tests.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1009,7 +1009,8 @@ $(3)/test/run-make/%-$(1)-T-$(2)-H-$(3).ok: \
10091009
$$(LD_LIBRARY_PATH_ENV_NAME$(1)_T_$(2)_H_$(3)) \
10101010
"$$(LD_LIBRARY_PATH_ENV_HOSTDIR$(1)_T_$(2)_H_$(3))" \
10111011
"$$(LD_LIBRARY_PATH_ENV_TARGETDIR$(1)_T_$(2)_H_$(3))" \
1012-
$(1)
1012+
$(1) \
1013+
$$(S)
10131014
@touch $$@
10141015
else
10151016
# FIXME #11094 - The above rule doesn't work right for multiple targets

‎trunk/src/doc/guide-crates.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
% The (old) Rust Crates and Modules Guide
22

3-
This content has moved into the
3+
This content has moved into
44
[the Rust Programming Language book](book/crates-and-modules.html).

‎trunk/src/doc/guide-error-handling.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
% Error Handling in Rust
22

3-
This content has moved into the
3+
This content has moved into
44
[the Rust Programming Language book](book/error-handling.html).

‎trunk/src/doc/guide-ffi.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
% The (old) Rust Foreign Function Interface Guide
22

3-
This content has moved into the
3+
This content has moved into
44
[the Rust Programming Language book](book/ffi.html).

‎trunk/src/doc/guide-macros.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
% The (old) Rust Macros Guide
22

3-
This content has moved into the
3+
This content has moved into
44
[the Rust Programming Language book](book/macros.html).

‎trunk/src/doc/guide-ownership.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
% The (old) Rust Ownership Guide
22

3-
This content has moved into the
3+
This content has moved into
44
[the Rust Programming Language book](book/ownership.html).

‎trunk/src/doc/guide-plugins.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
% The (old) Rust Compiler Plugins Guide
22

3-
This content has moved into the
3+
This content has moved into
44
[the Rust Programming Language book](book/plugins.html).

‎trunk/src/doc/guide-pointers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
% The (old) Rust Pointer Guide
22

3-
This content has moved into the
3+
This content has moved into
44
[the Rust Programming Language book](book/pointers.html).

‎trunk/src/doc/guide-strings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
% The (old) Guide to Rust Strings
22

3-
This content has moved into the
3+
This content has moved into
44
[the Rust Programming Language book](book/strings.html).

‎trunk/src/doc/guide-tasks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
% The (old) Rust Threads and Communication Guide
22

3-
This content has moved into the
3+
This content has moved into
44
[the Rust Programming Language book](book/tasks.html).

‎trunk/src/doc/guide-testing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
% The (old) Rust Testing Guide
22

3-
This content has moved into the
3+
This content has moved into
44
[the Rust Programming Language book](book/testing.html).

‎trunk/src/doc/guide-unsafe.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
% Writing Safe Low-level and Unsafe Code in Rust
22

3-
This content has moved into the
3+
This content has moved into
44
[the Rust Programming Language book](book/unsafe.html).

‎trunk/src/doc/guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
% The (old) Rust Guide
22

3-
This content has moved into the
3+
This content has moved into
44
[the Rust Programming Language book](book/README.html).

0 commit comments

Comments
 (0)