---

yaml
---
r: 14753
b: refs/heads/try
c: c758ef3
h: refs/heads/master
i:
  14751: 14d5ed0
v: v3

Author: catamorphism

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: e2dad03f44dd709c3263d2ede7d1bfae40a740b9
+refs/heads/try: c758ef3f386578cffd5353e1b84e94d1f30d760f
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/AUTHORS.txt

@@ -14,7 +14,6 @@ Brendan Eich <[email protected]>
 Brian Anderson <[email protected]>
 Chris Double <[email protected]>
 Chris Peterson <[email protected]>
-Damien Grassart <[email protected]>
 Daniel Brooks <[email protected]>
 Daniel Luz <[email protected]>
 Dave Herman <[email protected]>

branches/try/src/README.txt

@@ -2,7 +2,7 @@ This is preliminary version of the Rust compiler.
 
 Source layout:
 
-rustc/             The self-hosted compiler
+comp/              The self-hosted compiler
 
 cargo/             The package manager
 

branches/try/src/libcore/uint.rs

@@ -138,7 +138,7 @@ fn range(lo: uint, hi: uint, it: fn(uint)) {
 }
 
 /*
-Function: loop
+Function: iterate
 
 Iterate over the range [`lo`..`hi`), or stop when requested
 
@@ -153,7 +153,7 @@ Returns:
 `true` If execution proceeded correctly, `false` if it was interrupted,
 that is if `it` returned `false` at any point.
 */
-fn loop(lo: uint, hi: uint, it: fn(uint) -> bool) -> bool {
+fn iterate(lo: uint, hi: uint, it: fn(uint) -> bool) -> bool {
     let mut i = lo;
     while i < hi {
         if (!it(i)) { ret false; }

branches/try/src/libstd/uv.rs

@@ -53,11 +53,11 @@ enum uv_loop {
 #[nolink]
 native mod rustrt {
     fn rust_uv_loop_new() -> *ctypes::void;
-    fn rust_uv_loop_delete(loop: *ctypes::void);
+    fn rust_uv_loop_delete(lp: *ctypes::void);
     fn rust_uv_loop_set_data(
-        loop: *ctypes::void,
+        lp: *ctypes::void,
         data: *uv_loop_data);
-    fn rust_uv_bind_op_cb(loop: *ctypes::void, cb: *u8)
+    fn rust_uv_bind_op_cb(lp: *ctypes::void, cb: *u8)
         -> *ctypes::void;
     fn rust_uv_stop_op_cb(handle: *ctypes::void);
     fn rust_uv_run(loop_handle: *ctypes::void);
@@ -317,37 +317,37 @@ fn loop_new() -> uv_loop unsafe {
     ret comm::recv(ret_recv_port);
 }
 
-fn loop_delete(loop: uv_loop) {
-    let loop_ptr = get_loop_ptr_from_uv_loop(loop);
+fn loop_delete(lp: uv_loop) {
+    let loop_ptr = get_loop_ptr_from_uv_loop(lp);
     rustrt::rust_uv_loop_delete(loop_ptr);
 }
 
-fn run(loop: uv_loop) {
+fn run(lp: uv_loop) {
     let end_port = comm::port::<bool>();
     let end_chan = comm::chan::<bool>(end_port);
-    let loop_chan = get_loop_chan_from_uv_loop(loop);
+    let loop_chan = get_loop_chan_from_uv_loop(lp);
     comm::send(loop_chan, msg_run(end_chan));
     comm::recv(end_port);
 }
 
-fn run_in_bg(loop: uv_loop) {
-    let loop_chan = get_loop_chan_from_uv_loop(loop);
+fn run_in_bg(lp: uv_loop) {
+    let loop_chan = get_loop_chan_from_uv_loop(lp);
     comm::send(loop_chan, msg_run_in_bg);
 }
 
 fn async_init (
-    loop: uv_loop,
+    lp: uv_loop,
     async_cb: fn~(uv_handle),
     after_cb: fn~(uv_handle)) {
     let msg = msg_async_init(async_cb, after_cb);
-    let loop_chan = get_loop_chan_from_uv_loop(loop);
+    let loop_chan = get_loop_chan_from_uv_loop(lp);
     comm::send(loop_chan, msg);
 }
 
 fn async_send(async: uv_handle) {
     alt async {
-      uv_async(id, loop) {
-        let loop_chan = get_loop_chan_from_uv_loop(loop);
+      uv_async(id, lp) {
+        let loop_chan = get_loop_chan_from_uv_loop(lp);
         comm::send(loop_chan, msg_async_send(id));
       }
       _ {
@@ -362,18 +362,18 @@ fn close(h: uv_handle, cb: fn~()) {
     comm::send(loop_chan, msg_close(h, cb));
 }
 
-fn timer_init(loop: uv_loop, after_cb: fn~(uv_handle)) {
+fn timer_init(lp: uv_loop, after_cb: fn~(uv_handle)) {
     let msg = msg_timer_init(after_cb);
-    let loop_chan = get_loop_chan_from_uv_loop(loop);
+    let loop_chan = get_loop_chan_from_uv_loop(lp);
     comm::send(loop_chan, msg);
 }
 
 fn timer_start(the_timer: uv_handle, timeout: u32, repeat:u32,
                timer_cb: fn~(uv_handle)) {
     alt the_timer {
-      uv_timer(id, loop) {
+      uv_timer(id, lp) {
         let msg = msg_timer_start(id, timeout, repeat, timer_cb);
-        let loop_chan = get_loop_chan_from_uv_loop(loop);
+        let loop_chan = get_loop_chan_from_uv_loop(lp);
         comm::send(loop_chan, msg);
       }
       _ {
@@ -385,8 +385,8 @@ fn timer_start(the_timer: uv_handle, timeout: u32, repeat:u32,
 
 fn timer_stop(the_timer: uv_handle, after_cb: fn~(uv_handle)) {
     alt the_timer {
-      uv_timer(id, loop) {
-        let loop_chan = get_loop_chan_from_uv_loop(loop);
+      uv_timer(id, lp) {
+        let loop_chan = get_loop_chan_from_uv_loop(lp);
         let msg = msg_timer_stop(id, after_cb);
         comm::send(loop_chan, msg);
       }
@@ -423,8 +423,8 @@ fn get_loop_chan_from_data(data: *uv_loop_data)
 fn get_loop_chan_from_handle(handle: uv_handle)
     -> comm::chan<uv_msg> {
     alt handle {
-      uv_async(id,loop) | uv_timer(id,loop) {
-        let loop_chan = get_loop_chan_from_uv_loop(loop);
+      uv_async(id,lp) | uv_timer(id,lp) {
+        let loop_chan = get_loop_chan_from_uv_loop(lp);
         ret loop_chan;
       }
       _ {
@@ -434,15 +434,15 @@ fn get_loop_chan_from_handle(handle: uv_handle)
     }
 }
 
-fn get_loop_ptr_from_uv_loop(loop: uv_loop) -> *ctypes::void {
-    alt loop {
+fn get_loop_ptr_from_uv_loop(lp: uv_loop) -> *ctypes::void {
+    alt lp {
       uv_loop_new(loop_chan, loop_ptr) {
         ret loop_ptr;
       }
     }
 }
-fn get_loop_chan_from_uv_loop(loop: uv_loop) -> comm::chan<uv_msg> {
-    alt loop {
+fn get_loop_chan_from_uv_loop(lp: uv_loop) -> comm::chan<uv_msg> {
+    alt lp {
       uv_loop_new(loop_chan, loop_ptr) {
         ret loop_chan;
       }
@@ -451,7 +451,7 @@ fn get_loop_chan_from_uv_loop(loop: uv_loop) -> comm::chan<uv_msg> {
 
 fn get_id_from_handle(handle: uv_handle) -> [u8] {
     alt handle {
-      uv_async(id,loop) | uv_timer(id,loop) {
+      uv_async(id,lp) | uv_timer(id,lp) {
         ret id;
       }
       _ {
@@ -462,7 +462,7 @@ fn get_id_from_handle(handle: uv_handle) -> [u8] {
 
 // crust
 crust fn process_operation(
-        loop: *ctypes::void,
+        lp: *ctypes::void,
         data: *uv_loop_data) unsafe {
     let op_port = (*data).operation_port;
     let loop_chan = get_loop_chan_from_data(data);
@@ -472,7 +472,7 @@ crust fn process_operation(
           op_async_init(id) {
             let id_ptr = vec::unsafe::to_ptr(id);
             let async_handle = rustrt::rust_uv_async_init(
-                loop,
+                lp,
                 process_async_send,
                 id_ptr);
             comm::send(loop_chan, uv_async_init(
@@ -485,7 +485,7 @@ crust fn process_operation(
           op_timer_init(id) {
             let id_ptr = vec::unsafe::to_ptr(id);
             let timer_handle = rustrt::rust_uv_timer_init(
-                loop,
+                lp,
                 process_timer_call,
                 id_ptr);
             comm::send(loop_chan, uv_timer_init(
@@ -515,12 +515,12 @@ crust fn process_operation(
 fn handle_op_close(handle: uv_handle, handle_ptr: *ctypes::void) {
     // it's just like im doing C
     alt handle {
-      uv_async(id, loop) {
+      uv_async(id, lp) {
         let cb = process_close_async;
         rustrt::rust_uv_close(
             handle_ptr, cb);
       }
-      uv_timer(id, loop) {
+      uv_timer(id, lp) {
         let cb = process_close_timer;
         rustrt::rust_uv_close(
             handle_ptr, cb);

branches/try/src/rustc/driver/driver.rs

@@ -163,8 +163,6 @@ fn compile_upto(sess: session, cfg: ast::crate_cfg,
     let mutbl_map =
         time(time_passes, "mutability checking",
              bind middle::mutbl::check_crate(ty_cx, crate));
-    time(time_passes, "region checking",
-         bind middle::regionck::check_crate(ty_cx, crate));
     let (copy_map, ref_map) =
         time(time_passes, "alias checking",
              bind middle::alias::check_crate(ty_cx, crate));