Fixes for latest rust

src/sync.rs

@@ -35,7 +35,7 @@ impl<T: Send + Sync> Thunk<T> {
     /// });
     /// assert_eq!(**reff, 7u);
     /// ```
-    pub fn new<F>(producer: F) -> Thunk<T>
+    pub fn new<F: 'static>(producer: F) -> Thunk<T>
     where F: Send + Sync + FnOnce() -> T {
         Thunk {
             inner: OnceMutex::new(Unevaluated(Producer::new(producer)))
@@ -113,7 +113,7 @@ struct Producer<T> {
 }
 
 impl<T> Producer<T> {
-    fn new<F: Send + Sync + FnOnce() -> T>(f: F) -> Producer<T> {
+    fn new<F: 'static + Send + Sync + FnOnce() -> T>(f: F) -> Producer<T> {
         Producer {
             inner: Box::new(move |()| {
                 f()
@@ -131,4 +131,3 @@ enum Inner<T> {
     EvaluationInProgress,
     Unevaluated(Producer<T>)
 }
-

tests/single.rs

@@ -1,14 +1,12 @@
-#![feature(plugin, std_misc)]
+#![feature(plugin)]
+#![plugin(stainless)]
 
 #[macro_use]
 extern crate lazy;
 
-#[plugin]
-extern crate stainless;
-
 pub use lazy::single::Thunk;
 pub use std::sync::{Arc, Mutex};
-pub use std::thread::{self, Thread};
+pub use std::thread;
 
 describe! thunk {
     it "should evaluate when accessed" {
@@ -19,7 +17,10 @@ describe! thunk {
     it "should evaluate just once" {
         let counter = Arc::new(Mutex::new(0));
         let counter_clone = counter.clone();
-        let val = lazy!(*counter.lock().unwrap() += 1);
+        let val = lazy!({
+            let mut data = counter.lock().unwrap();
+            *data += 1;
+        });
         *val;
         *val;
         assert_eq!(*counter_clone.lock().unwrap(), 1);
@@ -28,7 +29,10 @@ describe! thunk {
     it "should not evaluate if not accessed" {
         let counter = Arc::new(Mutex::new(0));
         let counter_clone = counter.clone();
-        let _val = lazy!(*counter.lock().unwrap() += 1);
+        let _val = lazy!({
+            let mut data = counter.lock().unwrap();
+            *data += 1;
+        });
         assert_eq!(*counter_clone.lock().unwrap(), 0);
     }
 
@@ -50,7 +54,7 @@ describe! thunk {
         it "should drop internal data just once" {
             let counter = Arc::new(Mutex::new(0));
             let counter_clone = counter.clone();
-            let result =  Thread::scoped(move || {
+            let result = thread::spawn(move || {
                 let value = Dropper(counter_clone);
                 let t = Thunk::<()>::new(move || {
                     // Get a reference so value is captured.
@@ -79,4 +83,3 @@ impl Drop for Dropper {
         *count.lock().unwrap() += 1;
     }
 }
-

tests/sync.rs

@@ -1,15 +1,13 @@
-#![feature(plugin, std_misc, io)]
+#![feature(plugin, std_misc, old_io)]
+#![plugin(stainless)]
 
 #[macro_use]
 extern crate lazy;
 
-#[plugin]
-extern crate stainless;
-
 pub use lazy::sync::Thunk;
 pub use std::sync::{Arc, Barrier, Mutex};
 pub use std::{old_io, time};
-pub use std::thread::Thread;
+pub use std::thread;
 
 describe! sync {
     it "should evaluate when accessed" {
@@ -20,7 +18,10 @@ describe! sync {
     it "should evaluate just once" {
         let counter = Arc::new(Mutex::new(0));
         let counter_clone = counter.clone();
-        let val = sync_lazy!(*counter.lock().unwrap() += 1);
+        let val = sync_lazy!({
+            let mut data = counter.lock().unwrap();
+            *data += 1;
+        });
         *val;
         *val;
         assert_eq!(*counter_clone.lock().unwrap(), 1);
@@ -29,7 +30,10 @@ describe! sync {
     it "should not evaluate if not accessed" {
         let counter = Arc::new(Mutex::new(0));
         let counter_clone = counter.clone();
-        let _val = sync_lazy!(*counter.lock().unwrap() += 1);
+        let _val = sync_lazy!({
+            let mut data = counter.lock().unwrap();
+            *data += 1;
+        });
         assert_eq!(*counter_clone.lock().unwrap(), 0);
     }
 
@@ -46,7 +50,7 @@ describe! sync {
         let data_worker = data.clone();
 
         // Worker task.
-        Thread::spawn(move || {
+        thread::spawn(move || {
             data_worker.force();
         });
 
@@ -61,4 +65,3 @@ describe! sync {
         }
     }
 }
-