Merge ref 'd2f887349fe3' from rust-lang/rust

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

Upstream ref: d2f887349fe3ea079a4f89b020ce6df1993e1e06
Filtered ref: 9d58c60713ff95a4300515c3da1b009cd1e3fa90
Upstream diff: rust-lang/rust@69d4d5f...d2f8873

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

Author: The Miri Cronjob Bot

src/tests/directives.md

@@ -141,7 +141,6 @@ 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`.
 - Pointer width: `32bit`, `64bit`
 - Endianness: `endian-big`
 - Stage: `stage1`, `stage2`