Add newlines at end of file + use replace.

[rust.git] / src / helpers.rs

diff --git a/src/helpers.rs b/src/helpers.rs
index 5bb620b563d3c425f778ecb61f1c1fbe545c5999..a13d9b4519bd1773b4892a36cc8a75bdae4ac500 100644 (file)
--- a/src/helpers.rs
+++ b/src/helpers.rs
@@ -59,7 +59,7 @@ fn eval_path_scalar(
         let this = self.eval_context_mut();
         let instance = this.resolve_path(path);
         let cid = GlobalId { instance, promoted: None };
-        let const_val = this.const_eval_raw(cid)?;
+        let const_val = this.eval_to_allocation(cid)?;
         let const_val = this.read_scalar(const_val.into())?;
         return Ok(const_val);
     }
@@ -387,7 +387,7 @@ fn check_no_isolation(&self, name: &str) -> InterpResult<'tcx> {
     /// if this is not the case.
     fn assert_target_os(&self, target_os: &str, name: &str) {
         assert_eq!(
-            self.eval_context_ref().tcx.sess.target.target.target_os,
+            self.eval_context_ref().tcx.sess.target.target_os,
             target_os,
             "`{}` is only available on the `{}` target OS",
             name,
@@ -430,7 +430,7 @@ fn get_last_error(&mut self) -> InterpResult<'tcx, Scalar<Tag>> {
     fn set_last_error_from_io_error(&mut self, e: std::io::Error) -> InterpResult<'tcx> {
         use std::io::ErrorKind::*;
         let this = self.eval_context_mut();
-        let target = &this.tcx.sess.target.target;
+        let target = &this.tcx.sess.target;
         let target_os = &target.target_os;
         let last_error = if target.options.target_family == Some("unix".to_owned()) {
             this.eval_libc(match e.kind() {
@@ -555,7 +555,7 @@ fn read_timespec(
 
 pub fn isolation_error(name: &str) -> InterpResult<'static> {
     throw_machine_stop!(TerminationInfo::UnsupportedInIsolation(format!(
-        "`{}` not available when isolation is enabled",
+        "{} not available when isolation is enabled",
         name,
     )))
 }