From 734a0bfc0f51694f97812001b0f3b2c9aec339c7 Mon Sep 17 00:00:00 2001
From: Erik Hedvall <erikwhedvall@gmail.com>
Date: Mon, 15 Dec 2014 22:19:30 +0100
Subject: [PATCH 1/2] proc() -> move ||

---
 codegen/main.rs        | 2 +-
 src/http/server/mod.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/codegen/main.rs b/codegen/main.rs
index 5a6c05b..c182a70 100644
--- a/codegen/main.rs
+++ b/codegen/main.rs
@@ -8,7 +8,7 @@ pub mod status;
 pub mod read_method;
 
 fn main() {
-    spawn(proc() {
+    spawn(move || {
         let output_dir = Path::new(os::getenv("OUT_DIR").unwrap());
         read_method::generate(output_dir).unwrap();
     });
diff --git a/src/http/server/mod.rs b/src/http/server/mod.rs
index 427b3e0..666051c 100644
--- a/src/http/server/mod.rs
+++ b/src/http/server/mod.rs
@@ -35,7 +35,7 @@ pub trait Server: Send + Clone {
         };
         debug!("listening");
         let (perf_sender, perf_receiver) = channel();
-        spawn(proc() {
+        spawn(move || {
             perf_dumper(perf_receiver);
         });
         loop {
@@ -54,7 +54,7 @@ pub trait Server: Send + Clone {
             };
             let child_perf_sender = perf_sender.clone();
             let child_self = self.clone();
-            spawn(proc() {
+            spawn(move || {
                 let mut time_start = time_start;
                 let mut stream = BufferedStream::new(stream);
                 debug!("accepted connection");

From e55bc7d51656ac2c810e04fbd96997df8e878d23 Mon Sep 17 00:00:00 2001
From: Erik Hedvall <erikwhedvall@gmail.com>
Date: Mon, 15 Dec 2014 22:20:35 +0100
Subject: [PATCH 2/2] Unboxed closures are used in the fields of
 core::iter::Map,

---
 src/http/headers/serialization_utils.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/http/headers/serialization_utils.rs b/src/http/headers/serialization_utils.rs
index 79784f0..3f18873 100644
--- a/src/http/headers/serialization_utils.rs
+++ b/src/http/headers/serialization_utils.rs
@@ -53,8 +53,10 @@ pub fn comma_split(value: &str) -> Vec<String> {
 }
 
 pub fn comma_split_iter<'a>(value: &'a str)
-        -> ::std::iter::Map<'a, &'a str, &'a str, ::std::str::CharSplits<'a, char>> {
-    value.split(',').map(|w| w.trim_left())
+        -> ::std::iter::Map<&'a str, &'a str, ::std::str::CharSplits<'a, char>, fn(&str) -> &str> {
+    fn trim(w: &str) -> &str {w.trim_left()}
+    
+    value.split(',').map(trim)
 }
 
 pub trait WriterUtil: Writer {