---

yaml
---
r: 12563
b: refs/heads/master
c: 12f2f4c
h: refs/heads/master
i:
  12561: ab1f7a5
  12559: 95f5365
v: v3

Author: olsonjeffery

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: e604c15df18f5d8129b129eb46bb5e0a6f13c27b
+refs/heads/master: 12f2f4c15c467991d5675bbc4be7f7c2012ee5d3
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/libstd/uv.rs

@@ -1252,7 +1252,7 @@ mod test {
         log(debug, output);
         assert native_handle_size as uint == rust_handle_size;
     }
-    
+
     #[test]
     #[ignore(cfg(target_os = "freebsd"))]
     fn test_uv_struct_size_uv_timer_t() {

trunk/src/rt/rust_kernel.h

@@ -73,9 +73,9 @@ class rust_kernel {
     rust_scheduler* get_scheduler_by_id_nolock(rust_sched_id id);
     void end_weak_tasks();
 
-	// Used to communicate with the process-side, global libuv loop
-	uintptr_t global_loop_chan;
-	void** global_async_handle;
+    // Used to communicate with the process-side, global libuv loop
+    uintptr_t global_loop_chan;
+    void** global_async_handle;
 
 public:
     struct rust_env *env;
@@ -122,10 +122,10 @@ class rust_kernel {
 
     bool send_to_port(rust_port_id chan, void *sptr);
 
-	uintptr_t* get_global_loop() { return &global_loop_chan; }
-	void** get_global_async_handle() { return global_async_handle; }
-	void set_global_async_handle(void* handle) {
-		*global_async_handle = handle; }
+    uintptr_t* get_global_loop() { return &global_loop_chan; }
+    void** get_global_async_handle() { return global_async_handle; }
+    void set_global_async_handle(void* handle) {
+        *global_async_handle = handle; }
 };
 
 template <typename T> struct kernel_owned {

trunk/src/rt/rust_uv.cpp

@@ -209,12 +209,12 @@ rust_uv_hilvl_timer_start(uv_timer_t* the_timer, uint32_t timeout,
 
 extern "C" int
 rust_uv_timer_init(uv_loop_t* loop, uv_timer_t* timer) {
-	return uv_timer_init(loop, timer);
+    return uv_timer_init(loop, timer);
 }
 
 extern "C" int
 rust_uv_timer_start(uv_timer_t* the_timer, uv_timer_cb cb,
-						  uint32_t timeout, uint32_t repeat) {
+                        uint32_t timeout, uint32_t repeat) {
     return uv_timer_start(the_timer, cb, timeout, repeat);
 }
 
@@ -439,22 +439,22 @@ rust_uv_ip4_addr(const char* ip, int port) {
 
 extern "C" uintptr_t*
 rust_uv_get_kernel_global_chan_ptr() {
-	uintptr_t* result = rust_get_current_task()->kernel->get_global_loop();
+    uintptr_t* result = rust_get_current_task()->kernel->get_global_loop();
     rust_task* task = rust_get_current_task();
-	LOG(task, stdlib, "global loop: %lu", (unsigned long int)result);
-	LOG(task, stdlib,"global loop val: %lu", (unsigned long int)*result);
-	return result;
+    LOG(task, stdlib, "global loop: %lu", (unsigned long int)result);
+    LOG(task, stdlib,"global loop val: %lu", (unsigned long int)*result);
+    return result;
 }
 
 extern "C" void**
 rust_uv_get_kernel_global_async_handle() {
-	return rust_get_current_task()->kernel->get_global_async_handle();
+    return rust_get_current_task()->kernel->get_global_async_handle();
 }
 extern "C" void
 rust_uv_set_kernel_global_async_handle(uv_async_t* handle) {
-	rust_get_current_task()->kernel->set_global_async_handle((void*)handle);
+    rust_get_current_task()->kernel->set_global_async_handle((void*)handle);
 }
 extern "C" void
 rust_uv_free_kernel_global_async_handle() {
-	free((void*)rust_get_current_task()->kernel->get_global_async_handle());
+    free((void*)rust_get_current_task()->kernel->get_global_async_handle());
 }