diff options
| author | bors <bors@rust-lang.org> | 2019-04-04 02:31:46 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-04-04 02:31:46 +0000 |
| commit | a5dfdc589a1b44f01cb640cd0244372dcbbd6f37 (patch) | |
| tree | 2e64cd0111d47ed14ffdfbde912e5a746ac8b454 /src/doc | |
| parent | 314a79cd80ed905f80d24b79fd7acb4c8c72789b (diff) | |
| parent | 231bd482c6d2f2aae463f2d5b57ed3c8f5a0803e (diff) | |
| download | rust-a5dfdc589a1b44f01cb640cd0244372dcbbd6f37.tar.gz rust-a5dfdc589a1b44f01cb640cd0244372dcbbd6f37.zip | |
Auto merge of #59684 - Centril:rollup-n7pnare, r=Centril
Rollup of 6 pull requests Successful merges: - #59316 (Internal lints take 2) - #59663 (Be more direct about borrow contract) - #59664 (Updated the documentation of spin_loop and spin_loop_hint) - #59666 (Updated the environment description in rustc.) - #59669 (Reduce repetition in librustc(_lint) wrt. impl LintPass by using macros) - #59677 (rustfix coverage: Skip UI tests with non-json error-format) Failed merges: r? @ghost
Diffstat (limited to 'src/doc')
| -rw-r--r-- | src/doc/man/rustc.1 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/doc/man/rustc.1 b/src/doc/man/rustc.1 index 8f611063dbe..2faf0c2e3e1 100644 --- a/src/doc/man/rustc.1 +++ b/src/doc/man/rustc.1 @@ -265,8 +265,8 @@ Optimize with possible levels 0\[en]3 .SH ENVIRONMENT -Some of these affect the output of the compiler, while others affect programs -which link to the standard library. +Some of these affect only test harness programs (generated via rustc --test); +others affect all programs which link to the Rust standard library. .TP \fBRUST_TEST_THREADS\fR |