Merge from rustc

author Ralf Jung <post@ralfj.de>

Fri, 2 Dec 2022 17:16:08 +0000 (18:16 +0100)

committer Ralf Jung <post@ralfj.de>

Fri, 2 Dec 2022 17:16:08 +0000 (18:16 +0100)
author Ralf Jung <post@ralfj.de>
Fri, 2 Dec 2022 17:16:08 +0000 (18:16 +0100)
committer Ralf Jung <post@ralfj.de>
Fri, 2 Dec 2022 17:16:08 +0000 (18:16 +0100)
diff --cc src/tools/miri/src/concurrency/data_race.rs
Simple merge
author	Ralf Jung <post@ralfj.de>
	Fri, 2 Dec 2022 17:16:08 +0000 (18:16 +0100)
committer	Ralf Jung <post@ralfj.de>
	Fri, 2 Dec 2022 17:16:08 +0000 (18:16 +0100)