---

yaml
---
r: 58215
b: refs/heads/auto
c: bd4ee7c
h: refs/heads/master
i:
  58213: af7420b
  58211: d42513f
  58207: 59e79b5
v: v3

Author: seanmoon

[refs]

@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 270b508174ca33edb28e40c216e9adf395ac7f22
+refs/heads/auto: bd4ee7c7d2f00e8c41824fac7e5d155dff40c25f
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/Makefile.in

@@ -101,7 +101,7 @@ endif
 
 ifdef CFG_ENABLE_DEBUG
   $(info cfg: enabling more debugging (CFG_ENABLE_DEBUG))
-  CFG_RUSTC_FLAGS += --cfg debug
+  CFG_RUSTC_FLAGS +=
   CFG_GCCISH_CFLAGS += -DRUST_DEBUG
 else
   CFG_GCCISH_CFLAGS += -DRUST_NDEBUG

branches/auto/src/compiletest/runtest.rs

@@ -764,7 +764,7 @@ fn _arm_exec_compiled_test(config: config, props: TestProps,
     logv(config, fmt!("executing (%s) %s", config.target, cmdline));
 
     // adb shell dose not forward stdout and stderr of internal result
-    // to stdout and stderr seperately but to stdout only
+    // to stdout and stderr separately but to stdout only
     let mut newargs_out = ~[];
     let mut newargs_err = ~[];
     let subargs = args.args;

branches/auto/src/libcore/at_vec.rs

@@ -52,7 +52,7 @@ pub fn capacity<T>(v: @[T]) -> uint {
  * # Arguments
  *
  * * size - An initial size of the vector to reserve
- * * builder - A function that will construct the vector. It recieves
+ * * builder - A function that will construct the vector. It receives
  *             as an argument a function that will push an element
  *             onto the vector being constructed.
  */
@@ -70,7 +70,7 @@ pub fn build_sized<A>(size: uint, builder: &fn(push: &fn(v: A))) -> @[A] {
  *
  * # Arguments
  *
- * * builder - A function that will construct the vector. It recieves
+ * * builder - A function that will construct the vector. It receives
  *             as an argument a function that will push an element
  *             onto the vector being constructed.
  */
@@ -87,7 +87,7 @@ pub fn build<A>(builder: &fn(push: &fn(v: A))) -> @[A] {
  * # Arguments
  *
  * * size - An option, maybe containing initial size of the vector to reserve
- * * builder - A function that will construct the vector. It recieves
+ * * builder - A function that will construct the vector. It receives
  *             as an argument a function that will push an element
  *             onto the vector being constructed.
  */

branches/auto/src/libcore/rt/io/extensions.rs

@@ -11,7 +11,7 @@
 //! Utility mixins that apply to all Readers and Writers
 
 // XXX: Not sure how this should be structured
-// XXX: Iteration should probably be considered seperately
+// XXX: Iteration should probably be considered separately
 
 pub trait ReaderUtil {
 

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

@@ -38,35 +38,22 @@ mod local_heap;
 pub mod test;
 
 pub fn start(main: *u8, _argc: int, _argv: **c_char, _crate_map: *u8) -> int {
-
     use self::sched::{Scheduler, Task};
     use self::uvio::UvEventLoop;
-    use sys::Closure;
-    use ptr;
-    use cast;
 
     let loop_ = ~UvEventLoop::new();
     let mut sched = ~Scheduler::new(loop_);
-
     let main_task = ~do Task::new(&mut sched.stack_pool) {
-
-        unsafe {
-            // `main` is an `fn() -> ()` that doesn't take an environment
-            // XXX: Could also call this as an `extern "Rust" fn` once they work
-            let main = Closure {
-                code: main as *(),
-                env: ptr::null(),
-            };
-            let mainfn: &fn() = cast::transmute(main);
-
-            mainfn();
-        }
+        // 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);
+    }
 }
 
 /// Possible contexts in which Rust code may be executing.

branches/auto/src/libcore/task/local_data_priv.rs

@@ -133,7 +133,7 @@ unsafe fn get_newsched_local_map(local: *mut LocalStorage) -> TaskLocalMap {
 
 unsafe fn key_to_key_value<T: 'static>(key: LocalDataKey<T>) -> *libc::c_void {
     // Keys are closures, which are (fnptr,envptr) pairs. Use fnptr.
-    // Use reintepret_cast -- transmute would leak (forget) the closure.
+    // Use reinterpret_cast -- transmute would leak (forget) the closure.
     let pair: (*libc::c_void, *libc::c_void) = cast::transmute_copy(&key);
     pair.first()
 }

branches/auto/src/libcore/vec.rs

@@ -219,7 +219,7 @@ pub fn build<A>(builder: &fn(push: &fn(v: A))) -> ~[A] {
  * # Arguments
  *
  * * size - An option, maybe containing initial size of the vector to reserve
- * * builder - A function that will construct the vector. It recieves
+ * * builder - A function that will construct the vector. It receives
  *             as an argument a function that will push an element
  *             onto the vector being constructed.
  */

branches/auto/src/librustc/middle/trans/machine.rs

@@ -87,7 +87,7 @@ pub fn nonzero_llsize_of(cx: @CrateContext, t: TypeRef) -> ValueRef {
 }
 
 // Returns the preferred alignment of the given type for the current target.
-// The preffered alignment may be larger than the alignment used when
+// The preferred alignment may be larger than the alignment used when
 // packing the type into structs. This will be used for things like
 // allocations inside a stack frame, which LLVM has a free hand in.
 pub fn llalign_of_pref(cx: @CrateContext, t: TypeRef) -> uint {
@@ -96,7 +96,7 @@ pub fn llalign_of_pref(cx: @CrateContext, t: TypeRef) -> uint {
     }
 }
 
-// Returns the minimum alignment of a type required by the plattform.
+// Returns the minimum alignment of a type required by the platform.
 // This is the alignment that will be used for struct fields, arrays,
 // and similar ABI-mandated things.
 pub fn llalign_of_min(cx: @CrateContext, t: TypeRef) -> uint {

branches/auto/src/librustc/middle/typeck/check/vtable.rs

@@ -31,7 +31,7 @@ use syntax::print::pprust::expr_to_str;
 use syntax::visit;
 
 // vtable resolution looks for places where trait bounds are
-// subsituted in and figures out which vtable is used. There is some
+// substituted in and figures out which vtable is used. There is some
 // extra complication thrown in to support early "opportunistic"
 // vtable resolution. This is a hacky mechanism that is invoked while
 // typechecking function calls (after typechecking non-closure

branches/auto/src/libstd/arena.rs

@@ -20,7 +20,7 @@
 // calling the destructors on them.
 // One subtle point that needs to be addressed is how to handle
 // failures while running the user provided initializer function. It
-// is important to not run the destructor on uninitalized objects, but
+// is important to not run the destructor on uninitialized objects, but
 // how to detect them is somewhat subtle. Since alloc() can be invoked
 // recursively, it is not sufficient to simply exclude the most recent
 // object. To solve this without requiring extra space, we use the low

branches/auto/src/libstd/flatpipes.rs

@@ -15,7 +15,7 @@ or transformed to and from, byte vectors.
 
 The `FlatPort` and `FlatChan` types implement the generic channel and
 port interface for arbitrary types and transport strategies. It can
-particularly be used to send and recieve serializable types over I/O
+particularly be used to send and receive serializable types over I/O
 streams.
 
 `FlatPort` and `FlatChan` implement the same comm traits as pipe-based
@@ -55,7 +55,7 @@ use core::sys::size_of;
 use core::vec;
 
 /**
-A FlatPort, consisting of a `BytePort` that recieves byte vectors,
+A FlatPort, consisting of a `BytePort` that receives byte vectors,
 and an `Unflattener` that converts the bytes to a value.
 
 Create using the constructors in the `serial` and `pod` modules.
@@ -819,7 +819,7 @@ mod test {
             }
         }
 
-        // Reciever task
+        // Receiver task
         do task::spawn || {
             // Wait for a connection
             let (conn, res_chan) = accept_port.recv();
@@ -838,7 +838,7 @@ mod test {
 
             for int::range(0, 10) |i| {
                 let j = port.recv();
-                debug!("receieved %?", j);
+                debug!("received %?", j);
                 assert!(i == j);
             }
 

branches/auto/src/libstd/getopts.rs

@@ -623,7 +623,7 @@ pub mod groups {
                 desc_sep
             };
 
-            // Normalize desc to contain words seperated by one space character
+            // Normalize desc to contain words separated by one space character
             let mut desc_normalized_whitespace = ~"";
             for str::each_word(desc) |word| {
                 desc_normalized_whitespace.push_str(word);

branches/auto/src/libstd/net_ip.rs

@@ -420,7 +420,7 @@ mod test {
         if result::is_err(&ga_result) {
             fail!(~"got err result from net::ip::get_addr();")
         }
-        // note really sure how to realiably test/assert
+        // note really sure how to reliably test/assert
         // this.. mostly just wanting to see it work, atm.
         let results = result::unwrap(ga_result);
         debug!("test_get_addr: Number of results for %s: %?",

branches/auto/src/libstd/rope.rs

@@ -565,7 +565,7 @@ pub mod node {
      *
      * # Fields
      *
-     * * byte_offset = The number of bytes skippen in `content`
+     * * byte_offset = The number of bytes skipped in `content`
      * * byte_len - The number of bytes of `content` to use
      * * char_len - The number of chars in the leaf.
      * * content - Contents of the leaf.

branches/auto/src/libstd/test.rs

@@ -32,7 +32,7 @@ pub mod rustrt {
 }
 
 // The name of a test. By convention this follows the rules for rust
-// paths; i.e. it should be a series of identifiers seperated by double
+// paths; i.e. it should be a series of identifiers separated by double
 // colons. This way if some test runner wants to arrange the tests
 // hierarchically it may.
 

branches/auto/src/libstd/uv_global_loop.rs

@@ -222,6 +222,6 @@ mod test {
             exit_po.recv();
         };
         debug!(~"test_stress_gl_uv_global_loop_high_level_global_timer"+
-            ~" exiting sucessfully!");
+            ~" exiting successfully!");
     }
 }

branches/auto/src/libstd/uv_iotask.rs

@@ -243,7 +243,7 @@ fn impl_uv_iotask_async(iotask: &IoTask) {
     exit_po.recv();
 }
 
-// this fn documents the bear minimum neccesary to roll your own
+// this fn documents the bear minimum necessary to roll your own
 // high_level_loop
 #[cfg(test)]
 fn spawn_test_loop(exit_ch: ~Chan<()>) -> IoTask {

branches/auto/src/libstd/uv_ll.rs

@@ -269,7 +269,7 @@ pub struct sockaddr_in {
 }
 
 // unix size: 28 .. FIXME #1645
-// stuck with 32 becuse of rust padding structs?
+// stuck with 32 because of rust padding structs?
 #[cfg(target_arch="x86_64")]
 pub struct sockaddr_in6 {
     a0: *u8, a1: *u8,
@@ -286,7 +286,7 @@ pub struct sockaddr_in6 {
 }
 
 // unix size: 28 .. FIXME #1645
-// stuck with 32 becuse of rust padding structs?
+// stuck with 32 because of rust padding structs?
 pub type addr_in = addr_in_impl::addr_in;
 #[cfg(unix)]
 pub mod addr_in_impl {
@@ -1376,7 +1376,7 @@ mod test {
             let tcp_init_result = tcp_init(test_loop as *libc::c_void,
                                            tcp_handle_ptr);
             if (tcp_init_result == 0) {
-                debug!(~"sucessful tcp_init_result");
+                debug!(~"successful tcp_init_result");
 
                 debug!(~"building addr...");
                 let addr = ip4_addr(ip, port);