Skip to content

Commit 9826222

Browse files
committed
Auto merge of #7814 - ehuss:fix-em-dash, r=Eh2406
Fix some erroneous em-dashes in man pages. Unfortunately asciidoctor has a built-in substitution pass that cannot be disabled. Fixes #7807.
2 parents 426fae5 + a4dccf9 commit 9826222

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

src/doc/man/cargo-bench.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ the two dashes (`--`) are passed to the benchmark binaries and thus to
2121
_libtest_ (rustc's built in unit-test and micro-benchmarking framework). If
2222
you're passing arguments to both Cargo and the binary, the ones after `--` go
2323
to the binary, the ones before go to Cargo. For details about libtest's
24-
arguments see the output of `cargo bench -- --help`. As an example, this will
24+
arguments see the output of `cargo bench \-- --help`. As an example, this will
2525
run only the benchmark named `foo` (and skip other similarly named benchmarks
2626
like `foobar`):
2727

src/doc/man/cargo-test.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ dashes (`--`) are passed to the test binaries and thus to _libtest_ (rustc's
2121
built in unit-test and micro-benchmarking framework). If you're passing
2222
arguments to both Cargo and the binary, the ones after `--` go to the binary,
2323
the ones before go to Cargo. For details about libtest's arguments see the
24-
output of `cargo test -- --help`. As an example, this will run all tests with
24+
output of `cargo test \-- --help`. As an example, this will run all tests with
2525
`foo` in their name on 3 threads in parallel:
2626

2727
cargo test foo -- --test-threads 3

src/doc/man/generated/cargo-bench.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ <h2 id="cargo_bench_description">DESCRIPTION</h2>
2222
<em>libtest</em> (rustc&#8217;s built in unit-test and micro-benchmarking framework). If
2323
you&#8217;re passing arguments to both Cargo and the binary, the ones after <code>--</code> go
2424
to the binary, the ones before go to Cargo. For details about libtest&#8217;s
25-
arguments see the output of <code>cargo bench&#8201;&#8212;&#8201;--help</code>. As an example, this will
25+
arguments see the output of <code>cargo bench -- --help</code>. As an example, this will
2626
run only the benchmark named <code>foo</code> (and skip other similarly named benchmarks
2727
like <code>foobar</code>):</p>
2828
</div>

src/doc/man/generated/cargo-test.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ <h2 id="cargo_test_description">DESCRIPTION</h2>
2222
built in unit-test and micro-benchmarking framework). If you&#8217;re passing
2323
arguments to both Cargo and the binary, the ones after <code>--</code> go to the binary,
2424
the ones before go to Cargo. For details about libtest&#8217;s arguments see the
25-
output of <code>cargo test&#8201;&#8212;&#8201;--help</code>. As an example, this will run all tests with
25+
output of <code>cargo test -- --help</code>. As an example, this will run all tests with
2626
<code>foo</code> in their name on 3 threads in parallel:</p>
2727
</div>
2828
<div class="literalblock">

src/etc/man/cargo-bench.1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
.\" Title: cargo-bench
33
.\" Author: [see the "AUTHOR(S)" section]
44
.\" Generator: Asciidoctor 2.0.10
5-
.\" Date: 2019-12-05
5+
.\" Date: 2020-01-18
66
.\" Manual: \ \&
77
.\" Source: \ \&
88
.\" Language: English
99
.\"
10-
.TH "CARGO\-BENCH" "1" "2019-12-05" "\ \&" "\ \&"
10+
.TH "CARGO\-BENCH" "1" "2020-01-18" "\ \&" "\ \&"
1111
.ie \n(.g .ds Aq \(aq
1212
.el .ds Aq '
1313
.ss \n[.ss] 0
@@ -41,7 +41,7 @@ the two dashes (\fB\-\-\fP) are passed to the benchmark binaries and thus to
4141
\fIlibtest\fP (rustc\(cqs built in unit\-test and micro\-benchmarking framework). If
4242
you\(cqre passing arguments to both Cargo and the binary, the ones after \fB\-\-\fP go
4343
to the binary, the ones before go to Cargo. For details about libtest\(cqs
44-
arguments see the output of \fBcargo bench \(em \-\-help\fP. As an example, this will
44+
arguments see the output of \fBcargo bench \-\- \-\-help\fP. As an example, this will
4545
run only the benchmark named \fBfoo\fP (and skip other similarly named benchmarks
4646
like \fBfoobar\fP):
4747
.sp

src/etc/man/cargo-test.1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
.\" Title: cargo-test
33
.\" Author: [see the "AUTHOR(S)" section]
44
.\" Generator: Asciidoctor 2.0.10
5-
.\" Date: 2019-09-05
5+
.\" Date: 2020-01-18
66
.\" Manual: \ \&
77
.\" Source: \ \&
88
.\" Language: English
99
.\"
10-
.TH "CARGO\-TEST" "1" "2019-09-05" "\ \&" "\ \&"
10+
.TH "CARGO\-TEST" "1" "2020-01-18" "\ \&" "\ \&"
1111
.ie \n(.g .ds Aq \(aq
1212
.el .ds Aq '
1313
.ss \n[.ss] 0
@@ -41,7 +41,7 @@ dashes (\fB\-\-\fP) are passed to the test binaries and thus to \fIlibtest\fP (r
4141
built in unit\-test and micro\-benchmarking framework). If you\(cqre passing
4242
arguments to both Cargo and the binary, the ones after \fB\-\-\fP go to the binary,
4343
the ones before go to Cargo. For details about libtest\(cqs arguments see the
44-
output of \fBcargo test \(em \-\-help\fP. As an example, this will run all tests with
44+
output of \fBcargo test \-\- \-\-help\fP. As an example, this will run all tests with
4545
\fBfoo\fP in their name on 3 threads in parallel:
4646
.sp
4747
.if n .RS 4

0 commit comments

Comments
 (0)