about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-01-16 19:30:08 +0000
committerbors <bors@rust-lang.org>2023-01-16 19:30:08 +0000
commit4781233a77e879e49cb5ce3c98d2abba6a6ade7a (patch)
treef76cd2b5c3a2533b1e05547d67bcac920618020e /src
parent481725984b4cd94ef5c00917b01c1771b6e5299c (diff)
parent4fb9da1db5f307b20ccc175f259079e537aff1f9 (diff)
Auto merge of #106945 - matthiaskrgr:rollup-c5or8z3, r=matthiaskrgr
Rollup of 5 pull requests

Successful merges:

 - #105954 (Update instrument-coverage.md)
 - #106835 (new trait solver: rebase impl substs for gats correctly)
 - #106912 (check -Z query-dep-graph is enabled if -Z dump-dep-graph (#106736))
 - #106940 (Improve a TAIT error and add an error code plus documentation)
 - #106942 (Update books)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'src')
m---------src/doc/book0
m---------src/doc/nomicon0
m---------src/doc/reference0
m---------src/doc/rust-by-example0
m---------src/doc/rustc-dev-guide0
-rw-r--r--src/doc/rustc/src/instrument-coverage.md2
6 files changed, 2 insertions, 0 deletions
diff --git a/src/doc/book b/src/doc/book
-Subproject 2bd5d42c9956369132228da6409f0e68da56c51
+Subproject 2cd1b5593d26dc6a03c20f8619187ad4b248555
diff --git a/src/doc/nomicon b/src/doc/nomicon
-Subproject 8ca261268068d80c0969260fff15199bad87b58
+Subproject 960d610e7f33889a2577f5f17c26f0d5c82b30d
diff --git a/src/doc/reference b/src/doc/reference
-Subproject 3ae62681ff236d5528ef7c8c28ba7c6b2ecc673
+Subproject 2cb0ed9ba56360949f492f9866afe8c293f9f9d
diff --git a/src/doc/rust-by-example b/src/doc/rust-by-example
-Subproject 8888f9428fe9a48f31de6bd2cef9b9bf80791ed
+Subproject a9fb7d13eadfcc5f457962731f105b97f9a7474
diff --git a/src/doc/rustc-dev-guide b/src/doc/rustc-dev-guide
-Subproject b3e2a6e6c8a3aae5b5d950c63046f23bae07096
+Subproject 7352353ae91c48b136d2ca7d03822e1448165e1
diff --git a/src/doc/rustc/src/instrument-coverage.md b/src/doc/rustc/src/instrument-coverage.md
index 38fd5c96997..da91e25595c 100644
--- a/src/doc/rustc/src/instrument-coverage.md
+++ b/src/doc/rustc/src/instrument-coverage.md
@@ -201,6 +201,8 @@ $ RUSTFLAGS="-C instrument-coverage" \
     cargo test --tests
 ```
 
+> **Note**: The default for `LLVM_PROFILE_FILE` is `default_%m_%p.profraw`. Versions prior to 1.65 had a default of `default.profraw`, so if using those earlier versions, it is recommended to explicitly set `LLVM_PROFILE_FILE="default_%m_%p.profraw"` to avoid having multiple tests overwrite the `.profraw` files.
+
 Make note of the test binary file paths, displayed after the word "`Running`" in the test output:
 
 ```text