---

yaml
---
r: 65787
b: refs/heads/master
c: 305f511
h: refs/heads/master
i:
  65785: 77364ea
  65783: 34cda49
v: v3

Author: alexcrichton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 48c7bc17c68032d142dd6ce53b8f5933d52c2165
+refs/heads/master: 305f5110a7d4a1ccad32bd0b154e53df59664528
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 18e3db7392d2d0697b7e27d6d986139960144d85
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9

trunk/src/libextra/getopts.rs

@@ -31,21 +31,22 @@
  * file name following -o, and accepts both -h and --help as optional flags.
  *
  * ```
- *    extern mod std;
- *    use std::getopts::*;
+ *    extern mod extra;
+ *    use extra::getopts::*;
+ *    use std::os;
  *
  *    fn do_work(in: &str, out: Option<~str>) {
- *      io::println(in);
- *      io::println(match out {
- *        Some(x) => x,
- *        None => ~"No Output"
- *      });
+ *        println(in);
+ *        println(match out {
+ *            Some(x) => x,
+ *            None => ~"No Output"
+ *        });
  *    }
  *
- *    fn print_usage(program: &str, _opts: &[std::getopts::Opt]) {
- *      io::println(fmt!("Usage: %s [options]", program));
- *      io::println("-o\t\tOutput");
- *      io::println("-h --help\tUsage");
+ *    fn print_usage(program: &str, _opts: &[Opt]) {
+ *        println(fmt!("Usage: %s [options]", program));
+ *        println("-o\t\tOutput");
+ *        println("-h --help\tUsage");
  *    }
  *
  *    fn main() {
@@ -58,9 +59,9 @@
  *            optflag("h"),
  *            optflag("help")
  *        ];
- *        let matches = match getopts(vec::tail(args), opts) {
- *            result::Ok(m) => { m }
- *            result::Err(f) => { fail!(fail_str(f)) }
+ *        let matches = match getopts(args.tail(), opts) {
+ *            Ok(m) => { m }
+ *            Err(f) => { fail!(fail_str(f)) }
  *        };
  *        if opt_present(&matches, "h") || opt_present(&matches, "help") {
  *            print_usage(program, opts);

trunk/src/librustc/middle/trans/base.rs

@@ -3064,6 +3064,9 @@ pub fn trans_crate(sess: session::Session,
         }
         let int_type = T_int(targ_cfg);
         let float_type = T_float(targ_cfg);
+        let task_type = T_task(targ_cfg);
+        let taskptr_type = T_ptr(task_type);
+        lib::llvm::associate_type(tn, @"taskptr", taskptr_type);
         let tydesc_type = T_tydesc(targ_cfg);
         lib::llvm::associate_type(tn, @"tydesc", tydesc_type);
         let crate_map = decl_crate_map(sess, link_meta, llmod);
@@ -3128,6 +3131,7 @@ pub fn trans_crate(sess: session::Session,
               tydesc_type: tydesc_type,
               int_type: int_type,
               float_type: float_type,
+              task_type: task_type,
               opaque_vec_type: T_opaque_vec(targ_cfg),
               builder: BuilderRef_res(unsafe { llvm::LLVMCreateBuilder() }),
               shape_cx: mk_ctxt(llmod),

trunk/src/librustc/middle/trans/common.rs

@@ -221,6 +221,7 @@ pub struct CrateContext {
      tydesc_type: TypeRef,
      int_type: TypeRef,
      float_type: TypeRef,
+     task_type: TypeRef,
      opaque_vec_type: TypeRef,
      builder: BuilderRef_res,
      shape_cx: shape::Ctxt,
@@ -933,6 +934,28 @@ pub fn T_empty_struct() -> TypeRef { return T_struct([], false); }
 // they are described by this opaque type.
 pub fn T_vtable() -> TypeRef { T_array(T_ptr(T_i8()), 1u) }
 
+pub fn T_task(targ_cfg: @session::config) -> TypeRef {
+    let t = T_named_struct("task");
+
+    // Refcount
+    // Delegate pointer
+    // Stack segment pointer
+    // Runtime SP
+    // Rust SP
+    // GC chain
+
+
+    // Domain pointer
+    // Crate cache pointer
+
+    let t_int = T_int(targ_cfg);
+    let elems =
+        ~[t_int, t_int, t_int, t_int,
+         t_int, t_int, t_int, t_int];
+    set_struct_body(t, elems, false);
+    return t;
+}
+
 pub fn T_tydesc_field(cx: @CrateContext, field: uint) -> TypeRef {
     // Bit of a kludge: pick the fn typeref out of the tydesc..
 
@@ -1062,6 +1085,8 @@ pub fn T_chan(cx: @CrateContext, _t: TypeRef) -> TypeRef {
 
 }
 
+pub fn T_taskptr(cx: @CrateContext) -> TypeRef { return T_ptr(cx.task_type); }
+
 
 pub fn T_opaque_cbox_ptr(cx: @CrateContext) -> TypeRef {
     // closures look like boxes (even when they are ~fn or &fn)

trunk/src/libstd/unstable/finally.rs

@@ -31,17 +31,20 @@ pub trait Finally<T> {
     fn finally(&self, dtor: &fn()) -> T;
 }
 
-impl<'self,T> Finally<T> for &'self fn() -> T {
-    fn finally(&self, dtor: &fn()) -> T {
-        let _d = Finallyalizer {
-            dtor: dtor
-        };
-
-        (*self)()
+macro_rules! finally_fn {
+    ($fnty:ty) => {
+        impl<T> Finally<T> for $fnty {
+            fn finally(&self, dtor: &fn()) -> T {
+                let _d = Finallyalizer {
+                    dtor: dtor
+                };
+                (*self)()
+            }
+        }
     }
 }
 
-impl<T> Finally<T> for ~fn() -> T {
+impl<'self,T> Finally<T> for &'self fn() -> T {
     fn finally(&self, dtor: &fn()) -> T {
         let _d = Finallyalizer {
             dtor: dtor
@@ -51,15 +54,9 @@ impl<T> Finally<T> for ~fn() -> T {
     }
 }
 
-impl<T> Finally<T> for @fn() -> T {
-    fn finally(&self, dtor: &fn()) -> T {
-        let _d = Finallyalizer {
-            dtor: dtor
-        };
-
-        (*self)()
-    }
-}
+finally_fn!(~fn() -> T)
+finally_fn!(@fn() -> T)
+finally_fn!(extern "Rust" fn() -> T)
 
 struct Finallyalizer<'self> {
     dtor: &'self fn()
@@ -108,10 +105,7 @@ fn test_retval() {
 
 #[test]
 fn test_compact() {
-    // FIXME #4727: Should be able to use a fn item instead
-    // of a closure for do_some_fallible_work,
-    // but it's a type error.
-    let do_some_fallible_work: &fn() = || { };
+    fn do_some_fallible_work() {}
     fn but_always_run_this_function() { }
     do_some_fallible_work.finally(
         but_always_run_this_function);
@@ -136,4 +130,4 @@ fn test_managed() {
     };
     assert_eq!(do managed.finally {}, 10);
     assert_eq!(*i, 20);
-}
+}