---

yaml
---
r: 6807
b: refs/heads/master
c: e1a9668
h: refs/heads/master
i:
  6805: d6ee300
  6803: 54a27c3
  6799: 738ead7
v: v3

Author: boggle

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd6b80c9720bb4b0143378a052b568697ce3abe6
+refs/heads/master: e1a9668ab27805db83f97cafe2a937e6569863ff

trunk/src/libstd/comm.rs

@@ -29,6 +29,8 @@ Example:
 import sys;
 import task;
 
+import core::ctypes;
+
 export send;
 export recv;
 export chan;

trunk/src/libstd/fs.rs

@@ -4,6 +4,7 @@ Module: fs
 File system manipulation
 */
 
+import core::ctypes;
 import core::vec;
 import core::option;
 import os;

trunk/src/libstd/io.rs

@@ -6,8 +6,8 @@ Basic input/output
 
 import core::option;
 import core::result;
-import ctypes::fd_t;
-import ctypes::c_int;
+import core::ctypes::fd_t;
+import core::ctypes::c_int;
 
 #[abi = "cdecl"]
 native mod rustrt {

trunk/src/libstd/linux_os.rs

@@ -5,7 +5,7 @@ TODO: Restructure and document
 */
 
 import core::option;
-import ctypes::*;
+import core::ctypes::*;
 
 export libc;
 export libc_constants;

trunk/src/libstd/macos_os.rs

@@ -1,5 +1,5 @@
 import core::option;
-import ctypes::*;
+import core::ctypes::*;
 
 export libc;
 export libc_constants;

trunk/src/libstd/math.rs

@@ -23,9 +23,9 @@ import f32 = math_f32;
 
 // These two must match in width according to architecture
 
-import ctypes::m_float;
-import ctypes::c_int;
-import ptr;
+import core::mtypes::m_float;
+import core::ctypes::c_int;
+import core::ptr;
 import m_float = math_f64;
 
 /*

trunk/src/libstd/rope.rs

@@ -1103,7 +1103,7 @@ mod node {
                      right   : right,
              char_len: char_len(left) + char_len(right),
                      byte_len: byte_len(left) + byte_len(right),
-             height: math::max(height(left), height(right)) + 1u
+             height: float::max(height(left), height(right)) + 1u
                     })
     }
 

trunk/src/libstd/uv.rs

@@ -12,6 +12,8 @@ export loop_new, loop_delete, default_loop, run, unref;
 export idle_init, idle_start;
 export idle_new;
 
+import core::ctypes;
+
 #[link_name = "rustrt"]
 native mod uv {
     fn rust_uv_loop_new() -> *loop_t;

trunk/src/libstd/win32_os.rs

@@ -1,5 +1,5 @@
 import core::option;
-import ctypes::*;
+import core::ctypes::*;
 
 #[abi = "cdecl"]
 #[link_name = ""]               // FIXME remove after #[nolink] is snapshotted