nicer errors

rust-lang · Aug 26, 2022 · 235036f · 235036f
1 parent 8280233
commit 235036f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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(),
                 )