Fix path replacement in miri example

Author: carols10cents

listings/ch20-advanced-features/listing-20-07/output.txt

@@ -1,11 +1,11 @@
 $ cargo +nightly miri run
    Compiling unsafe-example v0.1.0 (file:///projects/unsafe-example)
     Finished `dev` profile [unoptimized + debuginfo] target(s) in 0.01s
-     Running `file:///home/.rustup/toolchains/nightly-aarch64-apple-darwin/bin/cargo-miri runner target/miri/aarch64-apple-darwin/debug/unsafe-example`
+     Running `file:///home/.rustup/toolchains/nightly/bin/cargo-miri runner target/miri/debug/unsafe-example`
 warning: integer-to-pointer cast
- --> src/main.rs:6:13
+ --> src/main.rs:5:13
   |
-6 |     let r = address as *mut i32;
+5 |     let r = address as *mut i32;
   |             ^^^^^^^^^^^^^^^^^^^ integer-to-pointer cast
   |
   = help: this program is using integer-to-pointer casts or (equivalently) `ptr::with_exposed_provenance`, which means that Miri might miss pointer bugs in this program
@@ -14,18 +14,18 @@ warning: integer-to-pointer cast
   = help: you can then set `MIRIFLAGS=-Zmiri-strict-provenance` to ensure you are not relying on `with_exposed_provenance` semantics
   = help: alternatively, `MIRIFLAGS=-Zmiri-permissive-provenance` disables this warning
   = note: BACKTRACE:
-  = note: inside `main` at src/main.rs:6:13: 6:32
+  = note: inside `main` at src/main.rs:5:13: 5:32
 
 error: Undefined Behavior: pointer not dereferenceable: pointer must be dereferenceable for 40000 bytes, but got 0x1234[noalloc] which is a dangling pointer (it has no provenance)
- --> src/main.rs:8:35
+ --> src/main.rs:7:35
   |
-8 |     let values: &[i32] = unsafe { slice::from_raw_parts_mut(r, 10000) };
+7 |     let values: &[i32] = unsafe { slice::from_raw_parts_mut(r, 10000) };
   |                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Undefined Behavior occurred here
   |
   = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
   = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
   = note: BACKTRACE:
-  = note: inside `main` at src/main.rs:8:35: 8:70
+  = note: inside `main` at src/main.rs:7:35: 7:70
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 

tools/update-rustc.sh

@@ -80,10 +80,13 @@ find -s listings -name output.txt -print0 | while IFS= read -r -d '' f; do
     #
     # - Replaces the path up to `.rustup/toolchains` with `file:///home`, while
     #   preserving leading spaces and the `-->`.
-    # - Replaces the version-and-architecture-tripl with just the version, so
+    # - Replaces the version-and-architecture-triple with just the version, so
     #   e.g. `1.82-aarch64-apple-darwin` becomes `1.82`.
     sed -i '' -E -e 's@^([[:space:]]*-->[[:space:]]+).*(\.rustup/toolchains/[[:digit:]]+\.[[:digit:]]+)([^/]*)@\1file:///home/\2@' "${full_output_path}"
 
+    # Similarly, replace Miri paths
+    sed -i '' -E -e "s@Running \`(.*)\.rustup/toolchains/nightly([^/]*)/bin/cargo-miri runner target/miri/([^/]*)/debug/([^/]*)@Running \`file:///home/.rustup/toolchains/nightly/bin/cargo-miri runner target/miri/debug/\4@" "${full_output_path}"
+
     # Restore the previous compile time, if there is one
     if [ -n  "${compile_time}" ]; then
         sed -i '' -E -e "s/Finished \`(dev|test)\` profile \[unoptimized \+ debuginfo] target\(s\) in [0-9.]*/Finished \`\1\` profile [unoptimized + debuginfo] target(s) in ${compile_time}/" "${full_output_path}"