Wire EnvSandbox into the ParseSess

Author: jsgf

src/Cargo.lock

@@ -1052,7 +1052,8 @@ pub fn build_session_(
     };
     let target_cfg = config::build_target_config(&sopts, &span_diagnostic);
 
-    let p_s = parse::ParseSess::with_span_handler(span_diagnostic, codemap);
+    let env_sb = Lrc::new(sopts.env_sb.clone());
+    let p_s = parse::ParseSess::with_span_handler(span_diagnostic, codemap, env_sb);
     let default_sysroot = match sopts.maybe_sysroot {
         Some(_) => None,
         None => Some(filesearch::get_or_default_sysroot()),

src/librustc/session/mod.rs

@@ -17,3 +17,4 @@ syntax_pos = { path = "../libsyntax_pos" }
 rustc_cratesio_shim = { path = "../librustc_cratesio_shim" }
 rustc_errors = { path = "../librustc_errors" }
 rustc_data_structures = { path = "../librustc_data_structures" }
+env_sandbox = { path = "../librustc_env_sandbox" }

src/libsyntax/Cargo.toml

@@ -40,6 +40,7 @@ pub extern crate rustc_errors as errors;
 extern crate syntax_pos;
 extern crate rustc_data_structures;
 #[macro_use] extern crate scoped_tls;
+extern crate env_sandbox;
 
 extern crate serialize as rustc_serialize; // used by deriving
 

src/libsyntax/lib.rs

@@ -1787,6 +1787,7 @@ mod tests {
     use diagnostics::plugin::ErrorMap;
     use rustc_data_structures::sync::Lock;
     use with_globals;
+    use env_sandbox::EnvSandbox;
     fn mk_sess(cm: Lrc<CodeMap>) -> ParseSess {
         let emitter = errors::emitter::EmitterWriter::new(Box::new(io::sink()),
                                                           Some(cm.clone()),
@@ -1802,6 +1803,7 @@ mod tests {
             raw_identifier_spans: Lock::new(Vec::new()),
             registered_diagnostics: Lock::new(ErrorMap::new()),
             non_modrs_mods: Lock::new(vec![]),
+            env_sandbox: Lrc::new(EnvSandbox::default()),
         }
     }
 

src/libsyntax/parse/lexer/mod.rs

@@ -22,6 +22,7 @@ use str::char_at;
 use symbol::Symbol;
 use tokenstream::{TokenStream, TokenTree};
 use diagnostics::plugin::ErrorMap;
+use env_sandbox::EnvSandbox;
 
 use std::collections::HashSet;
 use std::iter;
@@ -57,6 +58,7 @@ pub struct ParseSess {
     /// Used to determine and report recursive mod inclusions
     included_mod_stack: Lock<Vec<PathBuf>>,
     code_map: Lrc<CodeMap>,
+    env_sandbox: Lrc<EnvSandbox>,
 }
 
 impl ParseSess {
@@ -66,10 +68,12 @@ impl ParseSess {
                                                 true,
                                                 false,
                                                 Some(cm.clone()));
-        ParseSess::with_span_handler(handler, cm)
+        let env_sb = Lrc::new(EnvSandbox::default());
+        ParseSess::with_span_handler(handler, cm, env_sb)
     }
 
-    pub fn with_span_handler(handler: Handler, code_map: Lrc<CodeMap>) -> ParseSess {
+    pub fn with_span_handler(handler: Handler, code_map: Lrc<CodeMap>, env_sandbox: Lrc<EnvSandbox>)
+                                        -> ParseSess {
         ParseSess {
             span_diagnostic: handler,
             unstable_features: UnstableFeatures::from_environment(),
@@ -80,12 +84,17 @@ impl ParseSess {
             included_mod_stack: Lock::new(vec![]),
             code_map,
             non_modrs_mods: Lock::new(vec![]),
+            env_sandbox,
         }
     }
 
     pub fn codemap(&self) -> &CodeMap {
         &self.code_map
     }
+
+    pub fn env_sandbox(&self) -> &EnvSandbox {
+        &self.env_sandbox
+    }
 }
 
 #[derive(Clone)]