Auto merge of #503 - serde-rs:stack, r=erickt

Set RUST_MIN_STACK if unset

serde_codegen/src/env.rs

@@ -0,0 +1,36 @@
+use std::env;
+use std::ffi::OsStr;
+use std::ops::Drop;
+
+pub fn set_if_unset<K, V>(k: K, v: V) -> TmpEnv<K>
+    where K: AsRef<OsStr>,
+          V: AsRef<OsStr>,
+{
+    match env::var(&k) {
+        Ok(_) => TmpEnv::WasAlreadySet,
+        Err(_) => {
+            env::set_var(&k, v);
+            TmpEnv::WasNotSet { k: k }
+        }
+    }
+}
+
+#[must_use]
+pub enum TmpEnv<K>
+    where K: AsRef<OsStr>,
+{
+    WasAlreadySet,
+    WasNotSet {
+        k: K,
+    }
+}
+
+impl<K> Drop for TmpEnv<K>
+    where K: AsRef<OsStr>,
+{
+    fn drop(&mut self) {
+        if let TmpEnv::WasNotSet { ref k } = *self {
+            env::remove_var(k);
+        }
+    }
+}

serde_codegen/src/lib.rs

@@ -35,48 +35,62 @@ include!(concat!(env!("OUT_DIR"), "/lib.rs"));
 #[cfg(not(feature = "with-syntex"))]
 include!("lib.rs.in");
 
+#[cfg(feature = "with-syntex")]
+mod env;
+
 #[cfg(feature = "with-syntex")]
 pub fn expand<S, D>(src: S, dst: D) -> Result<(), syntex::Error>
     where S: AsRef<Path>,
           D: AsRef<Path>,
 {
-    use syntax::{ast, fold};
-
-    /// Strip the serde attributes from the crate.
-    #[cfg(feature = "with-syntex")]
-    fn strip_attributes(krate: ast::Crate) -> ast::Crate {
-        /// Helper folder that strips the serde attributes after the extensions have been expanded.
-        struct StripAttributeFolder;
-
-        impl fold::Folder for StripAttributeFolder {
-            fn fold_attribute(&mut self, attr: ast::Attribute) -> Option<ast::Attribute> {
-                match attr.node.value.node {
-                    ast::MetaItemKind::List(ref n, _) if n == &"serde" => { return None; }
-                    _ => {}
+    let src = src.as_ref().to_owned();
+    let dst = dst.as_ref().to_owned();
+
+    let expand_thread = move || {
+        use syntax::{ast, fold};
+
+        /// Strip the serde attributes from the crate.
+        #[cfg(feature = "with-syntex")]
+        fn strip_attributes(krate: ast::Crate) -> ast::Crate {
+            /// Helper folder that strips the serde attributes after the extensions have been expanded.
+            struct StripAttributeFolder;
+
+            impl fold::Folder for StripAttributeFolder {
+                fn fold_attribute(&mut self, attr: ast::Attribute) -> Option<ast::Attribute> {
+                    match attr.node.value.node {
+                        ast::MetaItemKind::List(ref n, _) if n == &"serde" => { return None; }
+                        _ => {}
+                    }
+
+                    Some(attr)
                 }
 
-                Some(attr)
+                fn fold_mac(&mut self, mac: ast::Mac) -> ast::Mac {
+                    fold::noop_fold_mac(mac, self)
+                }
             }
 
-            fn fold_mac(&mut self, mac: ast::Mac) -> ast::Mac {
-                fold::noop_fold_mac(mac, self)
-            }
+            fold::Folder::fold_crate(&mut StripAttributeFolder, krate)
         }
 
-        fold::Folder::fold_crate(&mut StripAttributeFolder, krate)
-    }
+        let mut reg = syntex::Registry::new();
+
+        reg.add_attr("feature(custom_derive)");
+        reg.add_attr("feature(custom_attribute)");
 
-    let mut reg = syntex::Registry::new();
+        reg.add_decorator("derive_Serialize", ser::expand_derive_serialize);
+        reg.add_decorator("derive_Deserialize", de::expand_derive_deserialize);
 
-    reg.add_attr("feature(custom_derive)");
-    reg.add_attr("feature(custom_attribute)");
+        reg.add_post_expansion_pass(strip_attributes);
 
-    reg.add_decorator("derive_Serialize", ser::expand_derive_serialize);
-    reg.add_decorator("derive_Deserialize", de::expand_derive_deserialize);
+        reg.expand("", src, dst)
+    };
 
-    reg.add_post_expansion_pass(strip_attributes);
+    // 16 MB stack unless otherwise specified
+    let _tmp_env = env::set_if_unset("RUST_MIN_STACK", "16777216");
 
-    reg.expand("", src.as_ref(), dst.as_ref())
+    use std::thread;
+    thread::spawn(expand_thread).join().unwrap()
 }
 
 #[cfg(not(feature = "with-syntex"))]