---

yaml
---
r: 66493
b: refs/heads/master
c: 408eef0
h: refs/heads/master
i:
  66491: fa2c9e2
v: v3

Author: thestinger

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: ca835f482cebcd353db789e45f9cec72db1a24ed
+refs/heads/master: 408eef0d89f4520b5ede7e5868a8ca1bc83795bc
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 18e3db7392d2d0697b7e27d6d986139960144d85
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9

trunk/src/etc/ctags.rust

@@ -8,4 +8,3 @@
 --regex-rust=/[ \t]*static[ \t]+([a-zA-Z0-9_]+)/\1/m,consts/
 --regex-rust=/[ \t]*trait[ \t]+([a-zA-Z0-9_]+)/\1/m,traits/
 --regex-rust=/[ \t]*impl[ \t]+([a-zA-Z0-9_]+)/\1/m,impls/
---regex-rust=/[ \t]*macro_rules![ \t]+([a-zA-Z0-9_]+)/\1/m,macros/

trunk/src/etc/vim/syntax/rust.vim

@@ -143,7 +143,6 @@ hi def link rustConditional   Conditional
 hi def link rustIdentifier    Identifier
 hi def link rustModPath       Include
 hi def link rustFuncName      Function
-hi def link rustFuncCall      Function
 hi def link rustCommentDoc    SpecialComment
 hi def link rustComment       Comment
 hi def link rustMacro         Macro

trunk/src/libextra/arc.rs

@@ -39,14 +39,15 @@
 
 #[allow(missing_doc)];
 
+use core::prelude::*;
 
 use sync;
 use sync::{Mutex, mutex_with_condvars, RWlock, rwlock_with_condvars};
 
-use std::cast;
-use std::unstable::sync::UnsafeAtomicRcBox;
-use std::task;
-use std::borrow;
+use core::cast;
+use core::unstable::sync::UnsafeAtomicRcBox;
+use core::task;
+use core::borrow;
 
 /// As sync::condvar, a mechanism for unlock-and-descheduling and signaling.
 pub struct Condvar<'self> {
@@ -513,13 +514,14 @@ impl<'self, T:Freeze + Send> RWReadMode<'self, T> {
 
 #[cfg(test)]
 mod tests {
+    use core::prelude::*;
 
     use arc::*;
 
-    use std::cell::Cell;
-    use std::comm;
-    use std::task;
-    use std::uint;
+    use core::cell::Cell;
+    use core::comm;
+    use core::task;
+    use core::uint;
 
     #[test]
     fn manually_share_arc() {

trunk/src/libextra/arena.rs

@@ -34,21 +34,22 @@
 
 #[allow(missing_doc)];
 
+use core::prelude::*;
 
 use list::{MutList, MutCons, MutNil};
 
-use std::at_vec;
-use std::cast::{transmute, transmute_mut, transmute_mut_region};
-use std::cast;
-use std::ptr;
-use std::sys;
-use std::uint;
-use std::vec;
-use std::unstable::intrinsics;
-use std::unstable::intrinsics::{TyDesc};
+use core::at_vec;
+use core::cast::{transmute, transmute_mut, transmute_mut_region};
+use core::cast;
+use core::ptr;
+use core::sys;
+use core::uint;
+use core::vec;
+use core::unstable::intrinsics;
+use core::unstable::intrinsics::{TyDesc};
 
 #[cfg(not(stage0))]
-use std::unstable::intrinsics::{get_tydesc};
+use core::unstable::intrinsics::{get_tydesc};
 
 #[cfg(stage0)]
 unsafe fn get_tydesc<T>() -> *TyDesc {

trunk/src/libextra/base64.rs

@@ -10,8 +10,9 @@
 
 //! Base64 binary-to-text encoding
 
+use core::prelude::*;
 
-use std::vec;
+use core::vec;
 
 /// A trait for converting a value to base64 encoding.
 pub trait ToBase64 {
@@ -198,7 +199,7 @@ impl<'self> FromBase64 for &'self str {
      * Convert any base64 encoded string (literal, `@`, `&`, or `~`)
      * to the byte values it encodes.
      *
-     * You can use the `from_bytes` function in `std::str`
+     * You can use the `from_bytes` function in `core::str`
      * to turn a `[u8]` into a string with characters corresponding to those values.
      *
      * # Example
@@ -209,7 +210,7 @@ impl<'self> FromBase64 for &'self str {
      * extern mod extra;
      * use extra::base64::ToBase64;
      * use extra::base64::FromBase64;
-     * use std::str;
+     * use core::str;
      *
      * fn main () {
      *     let hello_str = "Hello, World".to_base64();

trunk/src/libextra/bitv.rs

@@ -10,11 +10,12 @@
 
 #[allow(missing_doc)];
 
+use core::prelude::*;
 
-use std::cmp;
-use std::ops;
-use std::uint;
-use std::vec;
+use core::cmp;
+use core::ops;
+use core::uint;
+use core::vec;
 
 struct SmallBitv {
     /// only the lowest nbits of this value are used. the rest is undefined.
@@ -862,15 +863,15 @@ impl BitvSet {
 
 #[cfg(test)]
 mod tests {
-    use extra::test::BenchHarness;
+    use std::test::BenchHarness;
 
     use bitv::*;
     use bitv;
 
-    use std::uint;
-    use std::vec;
-    use std::rand;
-    use std::rand::Rng;
+    use core::uint;
+    use core::vec;
+    use core::rand;
+    use core::rand::Rng;
 
     static bench_bits : uint = 1 << 14;
 

trunk/src/libextra/c_vec.rs

@@ -36,9 +36,10 @@
  * still held if needed.
  */
 
+use core::prelude::*;
 
-use std::option;
-use std::ptr;
+use core::option;
+use core::ptr;
 
 /**
  * The type representing a foreign chunk of memory
@@ -149,8 +150,8 @@ mod tests {
 
     use c_vec::*;
 
-    use std::libc::*;
-    use std::libc;
+    use core::libc::*;
+    use core::libc;
 
     fn malloc(n: size_t) -> CVec<u8> {
         unsafe {

trunk/src/libextra/comm.rs

@@ -16,11 +16,12 @@ Higher level communication abstractions.
 
 #[allow(missing_doc)];
 
+use core::prelude::*;
 
-use std::comm::{GenericChan, GenericSmartChan, GenericPort};
-use std::comm::{Chan, Port, Selectable, Peekable};
-use std::comm;
-use std::pipes;
+use core::comm::{GenericChan, GenericSmartChan, GenericPort};
+use core::comm::{Chan, Port, Selectable, Peekable};
+use core::comm;
+use core::pipes;
 
 /// An extension of `pipes::stream` that allows both sending and receiving.
 pub struct DuplexStream<T, U> {

trunk/src/libextra/crypto/digest.rs

@@ -8,9 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
 
-use std::uint;
-use std::vec;
+use core::uint;
+use core::vec;
 
 /**
  * The Digest trait specifies an interface common to digest functions, such as SHA-1 and the SHA-2

trunk/src/libextra/crypto/sha1.rs

@@ -22,6 +22,7 @@
  * the `reset` method.
  */
 
+use core::prelude::*;
 
 use digest::Digest;
 
@@ -240,7 +241,7 @@ impl Digest for Sha1 {
 
 #[cfg(test)]
 mod tests {
-    use std::vec;
+    use core::vec;
 
     use digest::{Digest, DigestUtil};
     use sha1::Sha1;

trunk/src/libextra/crypto/sha2.rs

@@ -8,8 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
 
-use std::uint;
+use core::uint;
 
 use digest::Digest;
 

trunk/src/libextra/dbg.rs

@@ -12,17 +12,17 @@
 
 #[allow(missing_doc)];
 
-use std::cast::transmute;
+use core::cast::transmute;
 #[cfg(stage0)]
 use intrinsic::{get_tydesc};
 #[cfg(not(stage0))]
-use std::unstable::intrinsics::{get_tydesc};
+use core::unstable::intrinsics::{get_tydesc};
 
 pub mod rustrt {
     #[cfg(stage0)]
     use intrinsic::{TyDesc};
     #[cfg(not(stage0))]
-    use std::unstable::intrinsics::{TyDesc};
+    use core::unstable::intrinsics::{TyDesc};
 
     #[abi = "cdecl"]
     pub extern {

trunk/src/libextra/deque.rs

@@ -9,11 +9,12 @@
 // except according to those terms.
 
 //! A double-ended queue implemented as a circular buffer
+use core::prelude::*;
 
-use std::uint;
-use std::util::replace;
-use std::vec;
-use std::cast::transmute;
+use core::uint;
+use core::util::replace;
+use core::vec;
+use core::cast::transmute;
 
 static initial_capacity: uint = 32u; // 2^5
 
@@ -253,9 +254,9 @@ fn get<'r, T>(elts: &'r [Option<T>], i: uint) -> &'r T {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use std::cmp::Eq;
-    use std::kinds::Copy;
-    use std::int;
+    use core::cmp::Eq;
+    use core::kinds::Copy;
+    use core;
 
     #[test]
     fn test_simple() {
@@ -462,12 +463,12 @@ mod tests {
     #[test]
     fn test_iter() {
         let mut d = Deque::new();
-        for int::range(0,5) |i| {
+        for core::int::range(0,5) |i| {
             d.add_back(i);
         }
         assert_eq!(d.iter().collect::<~[&int]>(), ~[&0,&1,&2,&3,&4]);
 
-        for int::range(6,9) |i| {
+        for core::int::range(6,9) |i| {
             d.add_front(i);
         }
         assert_eq!(d.iter().collect::<~[&int]>(), ~[&8,&7,&6,&0,&1,&2,&3,&4]);
@@ -476,12 +477,12 @@ mod tests {
     #[test]
     fn test_rev_iter() {
         let mut d = Deque::new();
-        for int::range(0,5) |i| {
+        for core::int::range(0,5) |i| {
             d.add_back(i);
         }
         assert_eq!(d.rev_iter().collect::<~[&int]>(), ~[&4,&3,&2,&1,&0]);
 
-        for int::range(6,9) |i| {
+        for core::int::range(6,9) |i| {
             d.add_front(i);
         }
         assert_eq!(d.rev_iter().collect::<~[&int]>(), ~[&4,&3,&2,&1,&0,&6,&7,&8]);

trunk/src/libextra/dlist.rs

@@ -18,8 +18,9 @@ Do not use ==, !=, <, etc on doubly-linked lists -- it may not terminate.
 
 */
 
+use core::prelude::*;
 
-use std::managed;
+use core::managed;
 
 pub type DListLink<T> = Option<@mut DListNode<T>>;
 
@@ -521,6 +522,7 @@ impl<T:Copy> DList<T> {
 
 #[cfg(test)]
 mod tests {
+    use core::prelude::*;
 
     use super::*;