Bless Miri tests

Co-authored-by: Adrian <[email protected]>

Author: Noratrieb

src/tools/miri/tests/extern-so/fail/function_not_in_so.stderr

@@ -10,5 +10,5 @@ LL |         foo();
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/concurrency/libc_pthread_create_main_terminate.stderr

@@ -2,5 +2,5 @@ error: the main thread terminated without waiting for all remaining threads
 
 note: pass `-Zmiri-ignore-leaks` to disable this check
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/concurrency/libc_pthread_create_too_few_args.stderr

@@ -10,5 +10,5 @@ LL |     panic!()
    = note: inside `thread_start` at RUSTLIB/core/src/panic.rs:LL:CC
    = note: this error originates in the macro `$crate::panic::panic_2021` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/concurrency/libc_pthread_create_too_many_args.stderr

@@ -10,5 +10,5 @@ LL |     panic!()
    = note: inside `thread_start` at RUSTLIB/core/src/panic.rs:LL:CC
    = note: this error originates in the macro `$crate::panic::panic_2021` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/concurrency/libc_pthread_join_detached.stderr

@@ -11,5 +11,5 @@ LL |         assert_eq!(libc::pthread_join(native, ptr::null_mut()), 0);
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/concurrency/libc_pthread_join_joined.stderr

@@ -11,5 +11,5 @@ LL |         assert_eq!(libc::pthread_join(native, ptr::null_mut()), 0);
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/concurrency/libc_pthread_join_main.stderr

@@ -11,5 +11,5 @@ LL |             assert_eq!(libc::pthread_join(thread_id, ptr::null_mut()), 0);
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/concurrency/libc_pthread_join_multiple.stderr

@@ -11,5 +11,5 @@ LL | ...   assert_eq!(libc::pthread_join(native_copy, ptr::null_mut()), 0);
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/concurrency/libc_pthread_join_self.stderr

@@ -11,5 +11,5 @@ LL |             assert_eq!(libc::pthread_join(native, ptr::null_mut()), 0);
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/concurrency/unwind_top_of_stack.stderr

@@ -17,5 +17,5 @@ LL | | }
    = note: BACKTRACE:
    = note: inside `thread_start` at $DIR/unwind_top_of_stack.rs:LL:CC
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/shims/fs/close_stdout.stderr

@@ -10,5 +10,5 @@ LL |         libc::close(1);
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/shims/fs/isolated_stdin.stderr

@@ -11,5 +11,5 @@ LL |         libc::read(0, bytes.as_mut_ptr() as *mut libc::c_void, 512);
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/shims/fs/mkstemp_immutable_arg.stderr

@@ -16,5 +16,5 @@ LL |     test_mkstemp_immutable_arg();
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/shims/fs/read_from_stdout.stderr

@@ -10,5 +10,5 @@ LL |         libc::read(1, bytes.as_mut_ptr() as *mut libc::c_void, 512);
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/shims/fs/unix_open_missing_required_mode.stderr

@@ -16,5 +16,5 @@ LL |     test_file_open_missing_needed_mode();
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/shims/fs/write_to_stdin.stderr

@@ -10,5 +10,5 @@ LL |         libc::write(0, bytes.as_ptr() as *const libc::c_void, 5);
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/shims/memchr_null.stderr

@@ -11,5 +11,5 @@ LL |         libc::memchr(ptr::null(), 0, 0);
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/shims/memcmp_null.stderr

@@ -11,5 +11,5 @@ LL |         libc::memcmp(ptr::null(), ptr::null(), 0);
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/shims/memcmp_zero.stderr

@@ -11,5 +11,5 @@ LL |         libc::memcmp(ptr.cast(), ptr.cast(), 0);
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/shims/memcpy_zero.stderr

@@ -11,5 +11,5 @@ LL |         libc::memcpy(to.cast(), from.cast(), 0);
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/shims/memrchr_null.stderr

@@ -11,5 +11,5 @@ LL |         libc::memrchr(ptr::null(), 0, 0);
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/shims/mmap_invalid_dealloc.stderr

@@ -11,5 +11,5 @@ LL |         libc::free(ptr);
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/shims/mmap_use_after_munmap.stderr

@@ -43,5 +43,5 @@ LL |         libc::munmap(ptr, 4096);
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error; 1 warning emitted
+error: aborting due to 1 previous error; 1 warning emitted
 

src/tools/miri/tests/fail-dep/shims/munmap.stderr

@@ -35,5 +35,5 @@ LL | |         )
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error; 1 warning emitted
+error: aborting due to 1 previous error; 1 warning emitted
 

src/tools/miri/tests/fail-dep/shims/munmap_partial.stderr

@@ -25,5 +25,5 @@ LL |         libc::munmap(ptr, 1);
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error; 1 warning emitted
+error: aborting due to 1 previous error; 1 warning emitted
 

src/tools/miri/tests/fail-dep/shims/sync/libc_pthread_cond_double_destroy.stderr

@@ -11,5 +11,5 @@ LL |         libc::pthread_cond_destroy(cond.as_mut_ptr());
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/shims/sync/libc_pthread_condattr_double_destroy.stderr

@@ -11,5 +11,5 @@ LL |         libc::pthread_condattr_destroy(attr.as_mut_ptr());
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/shims/sync/libc_pthread_mutex_NULL_deadlock.stderr

@@ -11,5 +11,5 @@ LL |         libc::pthread_mutex_lock(&mut mutex as *mut _);
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/shims/sync/libc_pthread_mutex_deadlock.stderr

@@ -8,5 +8,5 @@ LL |             assert_eq!(libc::pthread_mutex_lock(lock_copy.0.get() as *mut _
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/shims/sync/libc_pthread_mutex_default_deadlock.stderr

@@ -11,5 +11,5 @@ LL |         libc::pthread_mutex_lock(&mut mutex as *mut _);
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/shims/sync/libc_pthread_mutex_destroy_locked.stderr

@@ -11,5 +11,5 @@ LL |         libc::pthread_mutex_destroy(&mut mutex as *mut _);
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/shims/sync/libc_pthread_mutex_double_destroy.stderr

@@ -11,5 +11,5 @@ LL |         libc::pthread_mutex_destroy(mutex.as_mut_ptr());
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/shims/sync/libc_pthread_mutex_normal_deadlock.stderr

@@ -8,5 +8,5 @@ LL |         libc::pthread_mutex_lock(&mut mutex as *mut _);
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/shims/sync/libc_pthread_mutex_normal_unlock_unlocked.stderr

@@ -11,5 +11,5 @@ LL |         libc::pthread_mutex_unlock(&mut mutex as *mut _);
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/shims/sync/libc_pthread_mutex_wrong_owner.stderr

@@ -11,5 +11,5 @@ LL | ...t_eq!(libc::pthread_mutex_unlock(lock_copy.0.get() as *mut _), 0);
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/shims/sync/libc_pthread_mutexattr_double_destroy.stderr

@@ -11,5 +11,5 @@ LL |         libc::pthread_mutexattr_destroy(attr.as_mut_ptr());
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/shims/sync/libc_pthread_rwlock_destroy_read_locked.stderr

@@ -11,5 +11,5 @@ LL |         libc::pthread_rwlock_destroy(rw.get());
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/shims/sync/libc_pthread_rwlock_destroy_write_locked.stderr

@@ -11,5 +11,5 @@ LL |         libc::pthread_rwlock_destroy(rw.get());
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/shims/sync/libc_pthread_rwlock_double_destroy.stderr

@@ -11,5 +11,5 @@ LL |         libc::pthread_rwlock_destroy(&mut lock);
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/shims/sync/libc_pthread_rwlock_read_write_deadlock_single_thread.stderr

@@ -8,5 +8,5 @@ LL |         libc::pthread_rwlock_wrlock(rw.get());
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/shims/sync/libc_pthread_rwlock_read_wrong_owner.stderr

@@ -11,5 +11,5 @@ LL | ...   assert_eq!(libc::pthread_rwlock_unlock(lock_copy.0.get() as *mut _),
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/shims/sync/libc_pthread_rwlock_unlock_unlocked.stderr

@@ -11,5 +11,5 @@ LL |         libc::pthread_rwlock_unlock(rw.get());
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/shims/sync/libc_pthread_rwlock_write_read_deadlock.stderr

@@ -8,5 +8,5 @@ LL |             assert_eq!(libc::pthread_rwlock_wrlock(lock_copy.0.get() as *mu
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/shims/sync/libc_pthread_rwlock_write_read_deadlock_single_thread.stderr

@@ -8,5 +8,5 @@ LL |         libc::pthread_rwlock_rdlock(rw.get());
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/shims/sync/libc_pthread_rwlock_write_write_deadlock.stderr

@@ -8,5 +8,5 @@ LL |             assert_eq!(libc::pthread_rwlock_wrlock(lock_copy.0.get() as *mu
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/shims/sync/libc_pthread_rwlock_write_write_deadlock_single_thread.stderr

@@ -8,5 +8,5 @@ LL |         libc::pthread_rwlock_wrlock(rw.get());
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/shims/sync/libc_pthread_rwlock_write_wrong_owner.stderr

@@ -11,5 +11,5 @@ LL | ...   assert_eq!(libc::pthread_rwlock_unlock(lock_copy.0.get() as *mut _),
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail-dep/unsupported_incomplete_function.stderr

@@ -10,5 +10,5 @@ LL |         libc::signal(libc::SIGPIPE, libc::SIG_IGN);
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail/alloc/deallocate-bad-alignment.stderr

@@ -16,5 +16,5 @@ LL |         dealloc(x, Layout::from_size_align_unchecked(1, 2));
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail/alloc/deallocate-bad-size.stderr

@@ -16,5 +16,5 @@ LL |         dealloc(x, Layout::from_size_align_unchecked(2, 1));
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail/alloc/deallocate-twice.stderr

@@ -26,5 +26,5 @@ LL |         dealloc(x, Layout::from_size_align_unchecked(1, 1));
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail/alloc/global_system_mixup.stderr

@@ -17,5 +17,5 @@ LL |         System.deallocate(ptr, l);
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail/alloc/no_global_allocator.stderr

@@ -8,5 +8,5 @@ LL |         __rust_alloc(1, 1);
    = note: BACKTRACE:
    = note: inside `start` at $DIR/no_global_allocator.rs:LL:CC
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail/alloc/reallocate-bad-size.stderr

@@ -16,5 +16,5 @@ LL |         let _y = realloc(x, Layout::from_size_align_unchecked(2, 1), 1);
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail/alloc/reallocate-change-alloc.stderr

@@ -21,5 +21,5 @@ LL |         let _y = realloc(x, Layout::from_size_align_unchecked(1, 1), 1);
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail/alloc/reallocate-dangling.stderr

@@ -26,5 +26,5 @@ LL |         let _z = realloc(x, Layout::from_size_align_unchecked(1, 1), 1);
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error
 

src/tools/miri/tests/fail/alloc/stack_free.stderr

@@ -20,5 +20,5 @@ LL |     drop(bad_box);
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 
-error: aborting due to previous error
+error: aborting due to 1 previous error