---

yaml
---
r: 107741
b: refs/heads/dist-snap
c: d904179
h: refs/heads/master
i:
  107739: 4ccb3fb
v: v3

Author: bytbox

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: f64fdf524a434f0e5cd0bc91d09c144723f3c90d
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 518a5e08c038fb74ba0efa8b29c7f80b7a42b970
+refs/heads/dist-snap: d904179066b407c32ca247938560fcf8766e5ff3
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/librustpkg/lib.rs

@@ -799,14 +799,14 @@ pub fn main_args(args: &[~str]) -> int {
     debug!("Will store workcache in {}", ws.display());
 
     // Wrap the rest in task::try in case of a condition failure in a task
-    let result = do task::try {
+    let result = task::try(proc() {
         BuildContext {
             context: context,
             sysroot: sysroot.clone(), // Currently, only tests override this
             workcache_context: api::default_context(sysroot.clone(),
                                                     default_workspace()).workcache_context
         }.run(command, args.clone())
-    };
+    });
     // FIXME #9262: This is using the same error code for all errors,
     // and at least one test case succeeds if rustpkg returns COPY_FAILED_CODE,
     // when actually, it might set the exit code for that even if a different

branches/dist-snap/src/librustpkg/tests.rs

@@ -607,13 +607,13 @@ fn test_install_invalid() {
     let ctxt = fake_ctxt(sysroot, &temp_workspace);
 
     // Uses task::try because of #9001
-    let result = do task::try {
+    let result = task::try(proc() {
         let pkg_src = PkgSrc::new(temp_workspace.clone(),
                                   temp_workspace.clone(),
                                   false,
                                   crateid.clone());
         ctxt.install(pkg_src, &WhatToBuild::new(MaybeCustom, Everything));
-    };
+    });
     assert!(result.unwrap_err()
             .to_str().contains("supplied path for package dir does not exist"));
 }

branches/dist-snap/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 = do prep.exec |exec| {
+        let out_path = prep.exec(|exec| {
             let out_path = api::build_library_in_workspace(exec,
                                                            &mut sub_cx.clone(),
                                                            "cdep",
@@ -60,22 +60,22 @@ pub fn main() {
                                                            "foo");
             let out_p = Path::new(out_path.unwrap());
             out_p.as_str().unwrap().to_owned()
-        };
+        });
         out_path
     });
     let out_lib_path = Path::new(out_lib_path);
     debug!("out_lib_path = {}", out_lib_path.display());
     context.add_library_path(out_lib_path.dir_path());
 
     let context_clone = context.clone();
-    let task_res = do task::try {
+    let task_res = task::try(proc() {
         let mut cc = context_clone.clone();
         api::install_pkg(&mut cc,
                          os::getcwd(),
                          ~"cdep",
                          None,
                          ~[(~"binary", out_lib_path.clone()), (~"file", foo_c_name.clone())]);
-    };
+    });
 
     if task_res.is_err() {
         os::set_exit_status(COPY_FAILED_CODE);