From 235036fcb3b8cac8b98774224c56c0ab7b454bb5 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Fri, 26 Aug 2022 17:43:04 -0400
Subject: [PATCH] nicer errors

---
 src/bin/miri.rs | 6 +++---
 src/machine.rs  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/bin/miri.rs b/src/bin/miri.rs
index fa6a307038..2684ad7ff3 100644
--- a/src/bin/miri.rs
+++ b/src/bin/miri.rs
@@ -534,14 +534,14 @@ fn main() {
             let filename = param.to_string();
             if std::path::Path::new(&filename).exists() {
                 if let Some(other_filename) = miri_config.external_so_file {
-                    panic!(
-                        "-Zmiri-extern-so-file external SO file is already set to {}",
+                    show_error!(
+                        "-Zmiri-extern-so-file is already set to {}",
                         other_filename.display()
                     );
                 }
                 miri_config.external_so_file = Some(filename.into());
             } else {
-                panic!("-Zmiri-extern-so-file path {} does not exist", filename);
+                show_error!("-Zmiri-extern-so-file `{}` does not exist", filename);
             }
         } else {
             // Forward to rustc.
diff --git a/src/machine.rs b/src/machine.rs
index 70b8263a9e..df2566de88 100644
--- a/src/machine.rs
+++ b/src/machine.rs
@@ -431,7 +431,7 @@ impl<'mir, 'tcx> Evaluator<'mir, 'tcx> {
                 (
                     unsafe {
                         libloading::Library::new(lib_file_path)
-                            .expect("Failed to read specified shared object file")
+                            .expect("failed to read specified extern shared object file")
                     },
                     lib_file_path.clone(),
                 )