about summary refs log tree commit diff
path: root/src/doc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-01-11 06:09:50 +0000
committerbors <bors@rust-lang.org>2021-01-11 06:09:50 +0000
commita2cd91ceb0f156cb442d75e12dc77c3d064cdde4 (patch)
tree208c016b62b3962a7913c8189d3aa884adf3e6e5 /src/doc
parent00c5c3922f5f638b4173bd821f57c94bbb18d43c (diff)
parenta7f7d70860634b08a1ff9a3de04b7aceaa4f5d9e (diff)
downloadrust-a2cd91ceb0f156cb442d75e12dc77c3d064cdde4.tar.gz
rust-a2cd91ceb0f156cb442d75e12dc77c3d064cdde4.zip
Auto merge of #80905 - JohnTitor:rollup-tmmwmnb, r=JohnTitor
Rollup of 6 pull requests

Successful merges:

 - #80809 (Use standard formatting for "rust-call" ABI message)
 - #80872 (Fix typo in source-based-code-coverage.md)
 - #80878 (Add ABI argument to `find_mir_or_eval_fn`)
 - #80881 ( Fix intra-doc links to `Self` and `crate` )
 - #80887 (log-color: Detect TTY based on stderr, not stdout)
 - #80892 (rustdoc: Remove `*` intra-doc alias for `pointer`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'src/doc')
-rw-r--r--src/doc/unstable-book/src/compiler-flags/source-based-code-coverage.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/doc/unstable-book/src/compiler-flags/source-based-code-coverage.md b/src/doc/unstable-book/src/compiler-flags/source-based-code-coverage.md
index 98bcadd12ee..8aca0052147 100644
--- a/src/doc/unstable-book/src/compiler-flags/source-based-code-coverage.md
+++ b/src/doc/unstable-book/src/compiler-flags/source-based-code-coverage.md
@@ -123,7 +123,7 @@ The `rustup` option is guaranteed to install a compatible version of the LLVM to
 ```shell
 $ rustup component add llvm-tools-preview
 $ cargo install cargo-binutils
-$ cargo profdata -- --help  # note the additional "--" preceeding the tool-specific arguments
+$ cargo profdata -- --help  # note the additional "--" preceding the tool-specific arguments
 ```
 
 ## Creating coverage reports