Auto merge of #21439 - alexcrichton:rollup, r=alexcrichton

Continuation of #21428
rust-lang · Jan 20, 2015 · 29bd9a0 · 29bd9a0
2 parents 583c5c5 + 631896d
commit 29bd9a0
Show file tree

Hide file tree

Showing 79 changed files with 499 additions and 300 deletions.
diff --git a/man/rustdoc.1 b/man/rustdoc.1
@@ -35,9 +35,27 @@ space-separated list of plugins to run (default: '')
 --plugin-path <val>
 directory to load plugins from (default: /tmp/rustdoc_ng/plugins)
 .TP
+--target <val>
+target triple to document
+.TP
+--crate-name <val>
+specify the name of this crate
+.TP
 -L --library-path <val>
 directory to add to crate search path
 .TP
+--cfg <val>
+pass a --cfg to rustc
+.TP
+--extern <val>
+pass an --extern to rustc
+.TP
+--test
+run code examples as tests
+.TP
+--test-args <val>
+pass arguments to the test runner
+.TP
 --html-in-header <val>
 file to add to <head>
 .TP
@@ -47,8 +65,20 @@ file to add in <body>, before content
 --html-after-content <val>
 file to add in <body>, after content
 .TP
+--markdown-css <val>
+CSS files to include via <link> in a rendered Markdown file
+.TP
+--markdown-playground-url <val>
+URL to send code snippets to
+.TP
+--markdown-no-toc
+don't include table of contents
+.TP
 -h, --help
 Print help
+.TP
+-V, --version
+Print rustdoc's version
 
 .SH "OUTPUT FORMATS"
 

diff --git a/mk/tests.mk b/mk/tests.mk
@@ -38,16 +38,14 @@ ifdef CHECK_IGNORED
   TESTARGS += --ignored
 endif
 
-TEST_BENCH =
 
 # Arguments to the cfail/rfail/rpass/bench tests
 ifdef CFG_VALGRIND
   CTEST_RUNTOOL = --runtool "$(CFG_VALGRIND)"
-  TEST_BENCH =
 endif
 
 ifdef PLEASE_BENCH
-  TEST_BENCH = --bench
+  TESTARGS += --bench
 endif
 
 # Arguments to the perf tests

diff --git a/src/doc/guide-crates.md b/src/doc/guide-crates.md
@@ -1,4 +1,4 @@
 % The (old) Rust Crates and Modules Guide
 
-This content has moved into the
+This content has moved into
 [the Rust Programming Language book](book/crates-and-modules.html).
diff --git a/src/doc/guide-error-handling.md b/src/doc/guide-error-handling.md
@@ -1,4 +1,4 @@
 % Error Handling in Rust
 
-This content has moved into the
+This content has moved into
 [the Rust Programming Language book](book/error-handling.html).
diff --git a/src/doc/guide-ffi.md b/src/doc/guide-ffi.md
@@ -1,4 +1,4 @@
 % The (old) Rust Foreign Function Interface Guide
 
-This content has moved into the
+This content has moved into
 [the Rust Programming Language book](book/ffi.html).
diff --git a/src/doc/guide-macros.md b/src/doc/guide-macros.md
@@ -1,4 +1,4 @@
 % The (old) Rust Macros Guide
 
-This content has moved into the
+This content has moved into
 [the Rust Programming Language book](book/macros.html).
diff --git a/src/doc/guide-ownership.md b/src/doc/guide-ownership.md
@@ -1,4 +1,4 @@
 % The (old) Rust Ownership Guide
 
-This content has moved into the
+This content has moved into
 [the Rust Programming Language book](book/ownership.html).
diff --git a/src/doc/guide-plugins.md b/src/doc/guide-plugins.md
@@ -1,4 +1,4 @@
 % The (old) Rust Compiler Plugins Guide
 
-This content has moved into the
+This content has moved into
 [the Rust Programming Language book](book/plugins.html).
diff --git a/src/doc/guide-pointers.md b/src/doc/guide-pointers.md
@@ -1,4 +1,4 @@
 % The (old) Rust Pointer Guide
 
-This content has moved into the
+This content has moved into
 [the Rust Programming Language book](book/pointers.html).
diff --git a/src/doc/guide-strings.md b/src/doc/guide-strings.md
@@ -1,4 +1,4 @@
 % The (old) Guide to Rust Strings
 
-This content has moved into the
+This content has moved into
 [the Rust Programming Language book](book/strings.html).
diff --git a/src/doc/guide-tasks.md b/src/doc/guide-tasks.md
@@ -1,4 +1,4 @@
 % The (old) Rust Threads and Communication Guide
 
-This content has moved into the
+This content has moved into
 [the Rust Programming Language book](book/tasks.html).
diff --git a/src/doc/guide-testing.md b/src/doc/guide-testing.md
@@ -1,4 +1,4 @@
 % The (old) Rust Testing Guide
 
-This content has moved into the
+This content has moved into
 [the Rust Programming Language book](book/testing.html).
diff --git a/src/doc/guide-unsafe.md b/src/doc/guide-unsafe.md
@@ -1,4 +1,4 @@
 % Writing Safe Low-level and Unsafe Code in Rust
 
-This content has moved into the
+This content has moved into
 [the Rust Programming Language book](book/unsafe.html).
diff --git a/src/doc/guide.md b/src/doc/guide.md
@@ -1,4 +1,4 @@
 % The (old) Rust Guide
 
-This content has moved into the
+This content has moved into
 [the Rust Programming Language book](book/README.html).