about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRalf Jung <post@ralfj.de>2022-10-12 19:54:33 +0200
committerRalf Jung <post@ralfj.de>2022-10-12 20:36:52 +0200
commite67e01b321eab10667fd3b2ae575005d015e0b88 (patch)
tree99803ba2d68353bcd8df2864672d573c76e18828
parent96737e3a52306192c23bf30b4108c568ec1f7701 (diff)
downloadrust-e67e01b321eab10667fd3b2ae575005d015e0b88.tar.gz
rust-e67e01b321eab10667fd3b2ae575005d015e0b88.zip
rustup
-rw-r--r--src/tools/miri/rust-version2
-rw-r--r--src/tools/miri/src/concurrency/weak_memory.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/miri/rust-version b/src/tools/miri/rust-version
index 89a02096550..21e9d5a05df 100644
--- a/src/tools/miri/rust-version
+++ b/src/tools/miri/rust-version
@@ -1 +1 @@
-0265a3e93bf1b89d97cae113ed214954d5c35e22
+538f118da1409759ba198acc0ff62070bc6d2dce
diff --git a/src/tools/miri/src/concurrency/weak_memory.rs b/src/tools/miri/src/concurrency/weak_memory.rs
index 9d7a49c0b43..f2a36572954 100644
--- a/src/tools/miri/src/concurrency/weak_memory.rs
+++ b/src/tools/miri/src/concurrency/weak_memory.rs
@@ -17,7 +17,7 @@
 //! load to the first, as a result of C++20's coherence-ordered before rules.
 //!
 //! Rust follows the C++20 memory model (except for the Consume ordering and some operations not performable through C++'s
-//! std::atomic<T> API). It is therefore possible for this implementation to generate behaviours never observable when the
+//! `std::atomic<T>` API). It is therefore possible for this implementation to generate behaviours never observable when the
 //! same program is compiled and run natively. Unfortunately, no literature exists at the time of writing which proposes
 //! an implementable and C++20-compatible relaxed memory model that supports all atomic operation existing in Rust. The closest one is
 //! A Promising Semantics for Relaxed-Memory Concurrency by Jeehoon Kang et al. (<https://www.cs.tau.ac.il/~orilahav/papers/popl17.pdf>)