librustc: Fix merge fallout.

Author: pcwalton

src/libextra/json.rs

@@ -1983,7 +1983,7 @@ mod tests {
     }
     fn check_err<T: Decodable<Decoder>>(to_parse: &'static str, expected_error: &str) {
         use std::task;
-        let res = task::try(|| {
+        let res = do task::try {
             // either fails in `decode` (which is what we want), or
             // returns Some(error_message)/None if the string was
             // invalid or valid JSON.
@@ -1994,7 +1994,7 @@ mod tests {
                     None
                 }
             }
-        });
+        };
         match res {
             Ok(Some(parse_error)) => fail!("`{}` is not valid json: {}",
                                            to_parse, parse_error),

src/libextra/sync.rs

@@ -230,12 +230,8 @@ impl<'self> Condvar<'self> {
             }).finally(|| {
                 // Reacquire the condvar.
                 match self.order {
-                    Just(lock) => do lock.access {
-                        self.sem.acquire();
-                    },
-                    Nothing => {
-                        self.sem.acquire();
-                    },
+                    Just(lock) => lock.access(|| self.sem.acquire()),
+                    Nothing => self.sem.acquire(),
                 }
             })
         })

src/libextra/time.rs

@@ -969,9 +969,9 @@ mod tests {
             // Windows does not understand "America/Los_Angeles".
             // PST+08 may look wrong, but not! "PST" indicates
             // the name of timezone. "+08" means UTC = local + 08.
-            do "TZ=PST+08".with_c_str |env| {
+            "TZ=PST+08".with_c_str(|env| {
                 _putenv(env);
-            }
+            })
         }
         tzset();
     }

src/librustc/middle/lint.rs

@@ -1204,17 +1204,17 @@ impl<'self> Visitor<()> for Context<'self> {
     }
 
     fn visit_foreign_item(&mut self, it: @ast::foreign_item, _: ()) {
-        do self.with_lint_attrs(it.attrs) |cx| {
+        self.with_lint_attrs(it.attrs, |cx| {
             check_attrs_usage(cx, it.attrs);
             visit::walk_foreign_item(cx, it, ());
-        }
+        })
     }
 
     fn visit_view_item(&mut self, i: &ast::view_item, _: ()) {
-        do self.with_lint_attrs(i.attrs) |cx| {
+        self.with_lint_attrs(i.attrs, |cx| {
             check_attrs_usage(cx, i.attrs);
             visit::walk_view_item(cx, i, ());
-        }
+        })
     }
 
     fn visit_pat(&mut self, p: &ast::Pat, _: ()) {

src/librustc/middle/privacy.rs

@@ -232,10 +232,10 @@ impl<'self> Visitor<()> for EmbargoVisitor<'self> {
                     _ => true,
                 };
                 let tr = ty::impl_trait_ref(self.tcx, local_def(item.id));
-                let public_trait = do tr.map_default(false) |tr| {
+                let public_trait = tr.map_default(false, |tr| {
                     !is_local(tr.def_id) ||
                      self.exported_items.contains(&tr.def_id.node)
-                };
+                });
 
                 if public_ty || public_trait {
                     for method in methods.iter() {

src/librustpkg/testsuite/pass/src/c-dependencies/pkg.rs

@@ -50,7 +50,7 @@ pub fn main() {
         prep.declare_input("file",
                            foo_c_name.as_str().unwrap().to_owned(),
                            digest_file_with_date(&foo_c_name));
-        let out_path = prep.exec(|exec| {
+        let out_path = do prep.exec |exec| {
             let out_path = api::build_library_in_workspace(exec,
                                                            &mut sub_cx.clone(),
                                                            "cdep",
@@ -60,7 +60,7 @@ pub fn main() {
                                                            "foo");
             let out_p = Path::new(out_path);
             out_p.as_str().unwrap().to_owned()
-        });
+        };
         out_path
     });
     let out_lib_path = Path::new(out_lib_path);

src/librustuv/net.rs

@@ -186,9 +186,9 @@ impl TcpWatcher {
                 0 => {
                     req.defuse(); // uv callback now owns this request
                     let mut cx = Ctx { status: 0, task: None };
-                    do wait_until_woken_after(&mut cx.task) {
+                    wait_until_woken_after(&mut cx.task, || {
                         req.set_data(&cx);
-                    }
+                    });
                     match cx.status {
                         0 => Ok(()),
                         n => Err(UvError(n)),

src/libstd/rc.rs

@@ -168,28 +168,6 @@ impl<T> Drop for Rc<T> {
     }
 }
 
-impl<T> Clone for RcMut<T> {
-    /// Return a shallow copy of the reference counted pointer.
-    #[inline]
-    fn clone(&self) -> RcMut<T> {
-        unsafe {
-            (*self.ptr).count += 1;
-            RcMut{ptr: self.ptr}
-        }
-    }
-}
-
-impl<T: DeepClone> DeepClone for RcMut<T> {
-    /// Return a deep copy of the reference counted pointer.
-    #[inline]
-    fn deep_clone(&self) -> RcMut<T> {
-        self.with_borrow(|x| {
-            // FIXME: #6497: should avoid freeze (slow)
-            unsafe { RcMut::new_unchecked(x.deep_clone()) }
-        })
-    }
-}
-
 #[cfg(test)]
 mod test_rc {
     use super::*;

src/libstd/rt/args.rs

@@ -150,14 +150,14 @@ mod imp {
             assert!(take() == Some(expected.clone()));
             assert!(take() == None);
 
-            do (|| {
-            }).finally {
+            (|| {
+            }).finally(|| {
                 // Restore the actual global state.
                 match saved_value {
                     Some(ref args) => put(args.clone()),
                     None => ()
                 }
-            }
+            })
         }
     }
 }

src/libstd/rt/comm.rs

@@ -990,11 +990,11 @@ mod test {
     #[test]
     fn recv_a_lot() {
         // Regression test that we don't run out of stack in scheduler context
-        run_in_newsched_task(|| {
+        do run_in_newsched_task {
             let (port, chan) = stream();
             10000.times(|| { chan.send(()) });
             10000.times(|| { port.recv() });
-        })
+        }
     }
 
     #[test]

src/libstd/select.rs

@@ -76,7 +76,7 @@ pub fn select<A: Select>(ports: &mut [A]) -> uint {
 
             let c = Cell::new(c.take());
             do sched.event_loop.callback { c.take().send_deferred(()) }
-        }
+        })
     }).finally(|| {
         // Unkillable is necessary not because getting killed is dangerous here,
         // but to force the recv not to use the same kill-flag that we used for

src/libstd/unstable/sync.rs

@@ -135,7 +135,7 @@ impl<T: Send> UnsafeArc<T> {
     /// block; otherwise, an unwrapping task can be killed by linked failure.
     pub fn unwrap(self) -> T {
         unsafe {
-            let mut this = this;
+            let mut this = self;
             // The ~ dtor needs to run if this code succeeds.
             let mut data: ~ArcData<T> = cast::transmute(this.data);
             // Set up the unwrap protocol.
@@ -192,7 +192,7 @@ impl<T: Send> UnsafeArc<T> {
                 cast::forget(data);
                 fail!("Another task is already unwrapping this Arc!");
             }
-        })
+        }
     }
 
     /// As unwrap above, but without blocking. Returns 'UnsafeArcSelf(self)' if this is

src/libstd/vec.rs

@@ -863,11 +863,11 @@ pub trait ImmutableVector<'self, T> {
     /// Returns an iterator over the subslices of the vector which are
     /// separated by elements that match `pred`, limited to splitting
     /// at most `n` times.
-    fn splitn(self, n: uint, pred: |&T| -> bool) -> SplitIterator<'self, T>;
+    fn splitn(self, n: uint, pred: 'self |&T| -> bool) -> SplitIterator<'self, T>;
     /// Returns an iterator over the subslices of the vector which are
     /// separated by elements that match `pred`. This starts at the
     /// end of the vector and works backwards.
-    fn rsplit(self, pred: |&T| -> bool) -> RSplitIterator<'self, T>;
+    fn rsplit(self, pred: 'self |&T| -> bool) -> RSplitIterator<'self, T>;
     /// Returns an iterator over the subslices of the vector which are
     /// separated by elements that match `pred` limited to splitting
     /// at most `n` times. This starts at the end of the vector and

src/test/bench/core-set.rs

@@ -1,3 +1,5 @@
+// xfail-pretty
+
 // Copyright 2013 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.

src/test/bench/shootout-pfib.rs

@@ -37,9 +37,9 @@ fn fib(n: int) -> int {
             let (pp, cc) = stream();
             let cc = SharedChan::new(cc);
             let ch = cc.clone();
-            task::spawn(|| pfib(&ch, n - 1) );
+            task::spawn(proc() pfib(&ch, n - 1));
             let ch = cc.clone();
-            task::spawn(|| pfib(&ch, n - 2) );
+            task::spawn(proc() pfib(&ch, n - 2));
             c.send(pp.recv() + pp.recv());
         }
     }

src/test/bench/task-perf-spawnalot.rs

@@ -15,7 +15,7 @@ use std::uint;
 fn f(n: uint) {
     let mut i = 0u;
     while i < n {
-        task::try(|| g() );
+        task::try(proc() g());
         i += 1u;
     }
 }

src/test/debug-info/lexical-scope-in-unique-closure.rs

@@ -51,7 +51,7 @@ fn main() {
     zzz();
     sentinel();
 
-    let unique_closure: proc(int) = |x| {
+    let unique_closure: proc(int) = proc(x) {
         zzz();
         sentinel();
 

src/test/debug-info/var-captured-in-sendable-closure.rs

@@ -39,7 +39,7 @@ fn main() {
 
     let owned = ~5;
 
-    let closure: proc() = || {
+    let closure: proc() = proc() {
         zzz();
         do_something(&constant, &a_struct.a, owned);
     };

src/test/pretty/disamb-stmt-expr.rs

@@ -16,5 +16,5 @@
 
 fn id(f: || -> int) -> int { f() }
 
-fn wsucc(_n: int) -> int { (do id || { 1 }) - 0 }
+fn wsucc(_n: int) -> int { id(|| { 1 }) - 0 }
 fn main() { }

src/test/pretty/do1.rs

@@ -12,4 +12,4 @@
 
 fn f(f: |int|) { f(10) }
 
-fn main() { do f |i| { assert!(i == 10) } }
+fn main() { f(|i| { assert!(i == 10) }) }

src/test/run-pass/borrowck-preserve-box-in-field.rs

@@ -1,3 +1,5 @@
+// xfail-pretty
+
 // Copyright 2012 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.

src/test/run-pass/borrowck-preserve-box-in-uniq.rs

@@ -1,3 +1,5 @@
+// xfail-pretty
+
 // Copyright 2012 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.

src/test/run-pass/borrowck-preserve-box.rs

@@ -1,3 +1,5 @@
+// xfail-pretty
+
 // Copyright 2012 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.

src/test/run-pass/borrowck-preserve-expl-deref.rs

@@ -1,3 +1,5 @@
+// xfail-pretty
+
 // Copyright 2012 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.