Rename export for shims::env::EnvVars

diff --git a/src/eval.rs b/src/eval.rs
index 936ae5b8953273d1d34fdea884af2c34f3ed88b6..496bcf990adc1f77f1c0383bcde8148ccc221ecf 100644 (file)
--- a/src/eval.rs
+++ b/src/eval.rs
@@ -12,7 +12,7 @@
     InterpResult, InterpError, InterpCx, StackPopCleanup, struct_error,
     Scalar, Tag, Pointer, FnVal,
     MemoryExtra, MiriMemoryKind, Evaluator, TlsEvalContextExt, HelpersEvalContextExt,
-    ShimsEnvVars,
+    EnvVars,
 };
 
 /// Configuration needed to spawn a Miri instance.
@@ -39,9 +39,9 @@ pub fn create_ecx<'mir, 'tcx: 'mir>(
         Evaluator::new(config.communicate),
         MemoryExtra::new(StdRng::seed_from_u64(config.seed.unwrap_or(0)), config.validate),
     );
-
-    ShimsEnvVars::init(config.communicate, &mut ecx, &tcx);
-
+    // Complete initialization.
+    EnvVars::init(&mut ecx, &tcx, config.communicate);
+    // Setup first stack-frame
     let main_instance = ty::Instance::mono(ecx.tcx.tcx, main_id);
     let main_mir = ecx.load_mir(main_instance.def)?;
 

diff --git a/src/lib.rs b/src/lib.rs
index 216e41d4f83860d7a6faf08bb5bea0b5798543ab..738419c2498b7819947f4c0b5ce407f62bfb2635 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -33,7 +33,7 @@
 pub use crate::shims::intrinsics::EvalContextExt as IntrinsicsEvalContextExt;
 pub use crate::shims::tls::{EvalContextExt as TlsEvalContextExt, TlsData};
 pub use crate::shims::dlsym::{Dlsym, EvalContextExt as DlsymEvalContextExt};
-pub use crate::shims::env::{EnvVars as ShimsEnvVars};
+pub use crate::shims::env::EnvVars;
 pub use crate::operator::EvalContextExt as OperatorEvalContextExt;
 pub use crate::range_map::RangeMap;
 pub use crate::helpers::{EvalContextExt as HelpersEvalContextExt};

diff --git a/src/machine.rs b/src/machine.rs
index 635b46bcdb0484629f46c16db9f14f125f9784a7..b4aac147f94fb184dde74ae8469955877f8e08e5 100644 (file)
--- a/src/machine.rs
+++ b/src/machine.rs
@@ -78,7 +78,7 @@ pub fn new(rng: StdRng, validate: bool) -> Self {
 pub struct Evaluator<'tcx> {
     /// Environment variables set by `setenv`.
     /// Miri does not expose env vars from the host to the emulated program.
-    pub(crate) env_vars: ShimsEnvVars,
+    pub(crate) env_vars: EnvVars,
 
     /// Program arguments (`Option` because we can only initialize them after creating the ecx).
     /// These are *pointers* to argc/argv because macOS.
@@ -102,7 +102,7 @@ pub(crate) fn new(communicate: bool) -> Self {
         Evaluator {
             // `env_vars` could be initialized properly here if `Memory` were available before
             // calling this method.
-            env_vars: ShimsEnvVars::default(),
+            env_vars: EnvVars::default(),
             argc: None,
             argv: None,
             cmd_line: None,

diff --git a/src/shims/env.rs b/src/shims/env.rs
index 4a15eb4cfb48aa575125108ce771fff83177a17c..d283cde8e3e9b7656db25d9c7fcb5557cd609b0d 100644 (file)
--- a/src/shims/env.rs
+++ b/src/shims/env.rs
@@ -12,9 +12,9 @@ pub struct EnvVars {
 
 impl EnvVars {
     pub(crate) fn init<'mir, 'tcx>(
-        communicate: bool,
         ecx: &mut InterpCx<'mir, 'tcx, Evaluator<'tcx>>,
         tcx: &TyCtxt<'tcx>,
+        communicate: bool,
     ) {
         if communicate {
             for (name, value) in std::env::vars() {