---

yaml
---
r: 51169
b: refs/heads/try
c: eadd358
h: refs/heads/master
i:
  51167: 356ad95
v: v3

Author: luqmana

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 5f13e9ccc2e3328d4cd8ca49f84e6840dd998346
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: f7a2371c176663d59062ec5158f39faecba45768
-refs/heads/try: bd7ba1fa62e5569a1a7c6335ff7b2a334cff2ad0
+refs/heads/try: eadd358b2a35a64ed91565ce436469089aa9e718
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libcore/core.rc

@@ -189,6 +189,7 @@ pub mod container;
 pub mod option;
 pub mod result;
 pub mod either;
+pub mod dlist;
 pub mod hashmap;
 pub mod cell;
 pub mod trie;

branches/try/src/libstd/dlist.rs renamed to branches/try/src/libcore/dlist.rs

@@ -18,8 +18,12 @@ Do not use ==, !=, <, etc on doubly-linked lists -- it may not terminate.
 
 */
 
-use core::prelude::*;
-use core::managed;
+use iter;
+use iter::BaseIter;
+use kinds::Copy;
+use managed;
+use option::{None, Option, Some};
+use vec;
 
 pub type DListLink<T> = Option<@mut DListNode<T>>;
 
@@ -536,8 +540,10 @@ impl<T> BaseIter<T> for @mut DList<T> {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-    use core::prelude::*;
+    use dlist::{DList, concat, from_vec, new_dlist_node};
+    use iter;
+    use option::{None, Some};
+    use vec;
 
     #[test]
     pub fn test_dlist_concat() {

branches/try/src/libcore/rt/mod.rs

@@ -48,6 +48,7 @@ mod context;
 mod thread;
 pub mod env;
 
+#[cfg(stage0)]
 pub fn start(main: *u8, _argc: int, _argv: *c_char, _crate_map: *u8) -> int {
     use self::sched::{Scheduler, Task};
     use self::uvio::UvEventLoop;
@@ -67,3 +68,22 @@ pub fn start(main: *u8, _argc: int, _argv: *c_char, _crate_map: *u8) -> int {
     }
 }
 
+#[cfg(not(stage0))]
+pub fn start(main: *u8, _argc: int, _argv: **c_char, _crate_map: *u8) -> int {
+    use self::sched::{Scheduler, Task};
+    use self::uvio::UvEventLoop;
+
+    let loop_ = ~UvEventLoop::new();
+    let mut sched = ~Scheduler::new(loop_);
+    let main_task = ~do Task::new(&mut sched.stack_pool) {
+        // XXX: Can't call a C function pointer from Rust yet
+        unsafe { rust_call_nullary_fn(main) };
+    };
+    sched.task_queue.push_back(main_task);
+    sched.run();
+    return 0;
+
+    extern {
+        fn rust_call_nullary_fn(f: *u8);
+    }
+}

branches/try/src/libcore/unstable/lang.rs

@@ -127,6 +127,7 @@ pub unsafe fn strdup_uniq(ptr: *c_uchar, len: uint) -> ~str {
 }
 
 #[lang="start"]
+#[cfg(stage0)]
 pub fn start(main: *u8, argc: int, argv: *c_char,
              crate_map: *u8) -> int {
     use libc::getenv;
@@ -150,6 +151,31 @@ pub fn start(main: *u8, argc: int, argv: *c_char,
     }
 }
 
+#[lang="start"]
+#[cfg(not(stage0))]
+pub fn start(main: *u8, argc: int, argv: **c_char,
+             crate_map: *u8) -> int {
+    use libc::getenv;
+    use rt::start;
+
+    unsafe {
+        let use_new_rt = do str::as_c_str("RUST_NEWRT") |s| {
+            getenv(s).is_null()
+        };
+        if use_new_rt {
+            return rust_start(main as *c_void, argc as c_int, argv,
+                              crate_map as *c_void) as int;
+        } else {
+            return start(main, argc, argv, crate_map);
+        }
+    }
+
+    extern {
+        fn rust_start(main: *c_void, argc: c_int, argv: **c_char,
+                      crate_map: *c_void) -> c_int;
+    }
+}
+
 // Local Variables:
 // mode: rust;
 // fill-column: 78;

branches/try/src/librustc/middle/trans/base.rs

@@ -2247,7 +2247,7 @@ pub fn create_main_wrapper(ccx: @CrateContext,
         fn main_name() -> ~str { return ~"WinMain@16"; }
         #[cfg(unix)]
         fn main_name() -> ~str { return ~"main"; }
-        let llfty = T_fn(~[ccx.int_type, T_ptr(T_i8())], ccx.int_type);
+        let llfty = T_fn(~[ccx.int_type, T_ptr(T_ptr(T_i8()))], ccx.int_type);
 
         // FIXME #4404 android JNI hacks
         let llfn = if *ccx.sess.building_library {

branches/try/src/libstd/serialize.rs

@@ -17,10 +17,10 @@ Core encoding and decoding interfaces.
 #[forbid(non_camel_case_types)];
 
 use core::prelude::*;
+use core::dlist::DList;
 use core::hashmap::linear::{LinearMap, LinearSet};
 use core::trie::{TrieMap, TrieSet};
 use deque::Deque;
-use dlist::DList;
 use treemap::{TreeMap, TreeSet};
 
 pub trait Encoder {

branches/try/src/libstd/std.rc

@@ -75,7 +75,6 @@ pub mod priority_queue;
 pub mod rope;
 pub mod smallintmap;
 pub mod sort;
-pub mod dlist;
 pub mod treemap;
 
 // And ... other stuff