Merge ref '69d4d5fc0e4d' from rust-lang/rust

Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: 69d4d5fc0e4db60272aac85ef27ecccef5764f3a
Filtered ref: a26d495b52327d29e0d66ac3050932a98a0ad6bb
Upstream diff: rust-lang/rust@7a72c54...69d4d5f

This merge was created using https://github.com/rust-lang/josh-sync.

Author: The Miri Cronjob Bot

src/tests/directives.md

@@ -141,8 +141,7 @@ Some examples of `X` in `ignore-X` or `only-X`:
 - OS: `android`, `emscripten`, `freebsd`, `ios`, `linux`, `macos`, `windows`,
   ...
 - Environment (fourth word of the target triple): `gnu`, `msvc`, `musl`
-- WASM: `wasm32-bare` matches `wasm32-unknown-unknown`. `emscripten` also
-  matches that target as well as the emscripten targets.
+- WASM: `wasm32-bare` matches `wasm32-unknown-unknown`.
 - Pointer width: `32bit`, `64bit`
 - Endianness: `endian-big`
 - Stage: `stage1`, `stage2`