From 0b5a30515e6977e4a9deaefa1c0ff243afbd6ef6 Mon Sep 17 00:00:00 2001 From: Christian Poveda Date: Fri, 10 Jan 2020 12:01:05 -0500 Subject: [PATCH] small corrections --- src/shims/fs.rs | 2 +- tests/run-pass/fs.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/shims/fs.rs b/src/shims/fs.rs index 3927f0e64919..57a88f2ccaae 100644 --- a/src/shims/fs.rs +++ b/src/shims/fs.rs @@ -337,7 +337,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx let this = self.eval_context_mut(); if this.tcx.sess.target.target.target_os.to_lowercase() != "macos" { - throw_unsup_format!("The `stat` shim is only available for `macos` targets.") + throw_unsup_format!("The `stat` and `lstat` shims are only available for `macos` targets.") } let path_scalar = this.read_scalar(path_op)?.not_undef()?; diff --git a/tests/run-pass/fs.rs b/tests/run-pass/fs.rs index 90b5dcfb5fa6..81c56e4aafc7 100644 --- a/tests/run-pass/fs.rs +++ b/tests/run-pass/fs.rs @@ -22,8 +22,8 @@ fn main() { let symlink_path = tmp.join("miri_test_fs_symlink.txt"); let bytes = b"Hello, World!\n"; // Clean the paths for robustness. - remove_file(&path).unwrap_or(()); - remove_file(&symlink_path).unwrap_or(()); + remove_file(&path).ok(); + remove_file(&symlink_path).ok(); // Test creating, writing and closing a file (closing is tested when `file` is dropped). let mut file = File::create(&path).unwrap();