---

yaml
---
r: 32483
b: refs/heads/dist-snap
c: 02ddbad
h: refs/heads/master
i:
  32481: cc27e8e
  32479: 8615bd1
v: v3

Author: olsonjeffery

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: 27129c6aba153299100887de5c8643cbe3e9b8ef
+refs/heads/dist-snap: 02ddbadc10d19a5cfa2dd6f8de89068bf4dfb852
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/libcore/future.rs

@@ -33,7 +33,11 @@ export future_pipe;
 
 #[doc = "The future type"]
 struct Future<A> {
-    /*priv*/ mut state: FutureState<A>,
+    /*priv*/ mut state: FutureState<A>;
+
+    // FIXME(#2829) -- futures should not be copyable, because they close
+    // over fn~'s that have pipes and so forth within!
+    drop {}
 }
 
 priv enum FutureState<A> {
@@ -88,7 +92,7 @@ fn from_port<A:Send>(+port: future_pipe::client::waiting<A>) -> Future<A> {
         port_ <-> *port;
         let port = option::unwrap(port_);
         match recv(port) {
-          future_pipe::completed(move data) => data
+            future_pipe::completed(move data) => data
         }
     }
 }

branches/dist-snap/src/libcore/unsafe.rs

@@ -415,13 +415,13 @@ mod tests {
 
         for uint::range(0u, num_tasks) |_i| {
             let total = total.clone();
-            futures += ~[future::spawn(|| {
+            vec::push(futures, future::spawn(|| {
                 for uint::range(0u, count) |_i| {
                     do total.with |count| {
                         **count += 1u;
                     }
                 }
-            })];
+            }));
         };
 
         for futures.each |f| { f.get() }