about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRalf Jung <post@ralfj.de>2022-11-13 13:16:12 +0100
committerGitHub <noreply@github.com>2022-11-13 13:16:12 +0100
commit096c33ff4bfb8077744c702b7ea15702e5a8831b (patch)
treead1ecf5af7c88016c624f807b7021b9ea72106c2
parent2b396870537cc73b0e6d974e833b057194a67ae7 (diff)
downloadrust-096c33ff4bfb8077744c702b7ea15702e5a8831b.tar.gz
rust-096c33ff4bfb8077744c702b7ea15702e5a8831b.zip
final tweaks
-rw-r--r--src/tools/miri/src/machine.rs2
-rw-r--r--src/tools/miri/tests/pass/miri-alloc.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/miri/src/machine.rs b/src/tools/miri/src/machine.rs
index 764bafac8fd..9a822bb0849 100644
--- a/src/tools/miri/src/machine.rs
+++ b/src/tools/miri/src/machine.rs
@@ -123,7 +123,7 @@ impl fmt::Display for MiriMemoryKind {
         use self::MiriMemoryKind::*;
         match self {
             Rust => write!(f, "Rust heap"),
-            Miri => write!(f, "Miri heap"),
+            Miri => write!(f, "Miri bare-metal heap"),
             C => write!(f, "C heap"),
             WinHeap => write!(f, "Windows heap"),
             Machine => write!(f, "machine-managed memory"),
diff --git a/src/tools/miri/tests/pass/miri-alloc.rs b/src/tools/miri/tests/pass/miri-alloc.rs
index 7caeb86b478..f6464b5bd01 100644
--- a/src/tools/miri/tests/pass/miri-alloc.rs
+++ b/src/tools/miri/tests/pass/miri-alloc.rs
@@ -14,7 +14,7 @@ extern "Rust" {
 fn start(_: isize, _: *const *const u8) -> isize {
     unsafe {
         let ptr = miri_alloc(123, 1);
-        core::ptr::write_bytes(ptr, 0, 123);
+        core::ptr::write_bytes(ptr, 0u8, 123);
         miri_dealloc(ptr, 123, 1);
     }
     0