Skip to content

Commit 18d6aad

Browse files
lilyballlilyball
committed
---
yaml --- r: 174682 b: refs/heads/snap-stage3 c: c166017 h: refs/heads/master v: v3
1 parent 66ea5e4 commit 18d6aad

File tree

136 files changed

+832
-1935
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

+832
-1935
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: 8d05f6c74c34c1d72fd91be3057fe7d4581aca3a
4+
refs/heads/snap-stage3: c1660174454d5baccf10efdc9bf634624ee18ff5
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: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -35,27 +35,9 @@ 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
4438
-L --library-path <val>
4539
directory to add to crate search path
4640
.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
5941
--html-in-header <val>
6042
file to add to <head>
6143
.TP
@@ -65,20 +47,8 @@ file to add in <body>, before content
6547
--html-after-content <val>
6648
file to add in <body>, after content
6749
.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
7750
-h, --help
7851
Print help
79-
.TP
80-
-V, --version
81-
Print rustdoc's version
8252

8353
.SH "OUTPUT FORMATS"
8454

‎branches/snap-stage3/mk/tests.mk

Lines changed: 2 additions & 5 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
@@ -1011,8 +1009,7 @@ $(3)/test/run-make/%-$(1)-T-$(2)-H-$(3).ok: \
10111009
$$(LD_LIBRARY_PATH_ENV_NAME$(1)_T_$(2)_H_$(3)) \
10121010
"$$(LD_LIBRARY_PATH_ENV_HOSTDIR$(1)_T_$(2)_H_$(3))" \
10131011
"$$(LD_LIBRARY_PATH_ENV_TARGETDIR$(1)_T_$(2)_H_$(3))" \
1014-
$(1) \
1015-
$$(S)
1012+
$(1)
10161013
@touch $$@
10171014
else
10181015
# FIXME #11094 - The above rule doesn't work right for multiple targets

‎branches/snap-stage3/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
3+
This content has moved into the
44
[the Rust Programming Language book](book/crates-and-modules.html).

‎branches/snap-stage3/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
3+
This content has moved into the
44
[the Rust Programming Language book](book/error-handling.html).

‎branches/snap-stage3/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
3+
This content has moved into the
44
[the Rust Programming Language book](book/ffi.html).

‎branches/snap-stage3/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
3+
This content has moved into the
44
[the Rust Programming Language book](book/macros.html).

‎branches/snap-stage3/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
3+
This content has moved into the
44
[the Rust Programming Language book](book/ownership.html).

‎branches/snap-stage3/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
3+
This content has moved into the
44
[the Rust Programming Language book](book/plugins.html).

‎branches/snap-stage3/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
3+
This content has moved into the
44
[the Rust Programming Language book](book/pointers.html).

‎branches/snap-stage3/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
3+
This content has moved into the
44
[the Rust Programming Language book](book/strings.html).

‎branches/snap-stage3/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
3+
This content has moved into the
44
[the Rust Programming Language book](book/tasks.html).

‎branches/snap-stage3/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
3+
This content has moved into the
44
[the Rust Programming Language book](book/testing.html).

‎branches/snap-stage3/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
3+
This content has moved into the
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
3+
This content has moved into the
44
[the Rust Programming Language book](book/README.html).

0 commit comments

Comments
 (0)