Skip to content

Commit 1129e64

Browse files
committed
---
yaml --- r: 174687 b: refs/heads/snap-stage3 c: c49d428 h: refs/heads/master i: 174685: 2122856 174683: 2caba31 174679: fd8b33e 174671: e131b91 174655: 8ed3a68 v: v3
1 parent fffd6f2 commit 1129e64

Some content is hidden

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

74 files changed

+489
-298
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: a0f86de49748b472d4d189d9688b0d856c000914
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 5cd9a69832f304c0bbb52d92ad3a0a7893760ae2
4+
refs/heads/snap-stage3: c49d428165e83d2498a9279a3c06f42b5fcef0c3
55
refs/heads/try: 08f6380a9f0b866796080094f44fe25ea5636547
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/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

branches/snap-stage3/mk/tests.mk

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,14 @@ ifdef CHECK_IGNORED
3838
TESTARGS += --ignored
3939
endif
4040

41-
TEST_BENCH =
4241

4342
# Arguments to the cfail/rfail/rpass/bench tests
4443
ifdef CFG_VALGRIND
4544
CTEST_RUNTOOL = --runtool "$(CFG_VALGRIND)"
46-
TEST_BENCH =
4745
endif
4846

4947
ifdef PLEASE_BENCH
50-
TEST_BENCH = --bench
48+
TESTARGS += --bench
5149
endif
5250

5351
# Arguments to the perf tests
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).
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).
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).
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).
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).
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).
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).
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).
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).
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).
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).

branches/snap-stage3/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)