---

yaml
---
r: 21470
b: refs/heads/snap-stage3
c: aab4d6b
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 6c5c835a1dccd55287bbd81564d74a009497be57
+refs/heads/snap-stage3: aab4d6b8d73f029d178c3ac055152f57c7233995
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libstd/arc.rs

@@ -10,13 +10,13 @@ import unsafe::{SharedMutableState, shared_mutable_state,
                 clone_shared_mutable_state, unwrap_shared_mutable_state,
                 get_shared_mutable_state, get_shared_immutable_state};
 import sync;
-import sync::{Mutex,  mutex,  mutex_with_condvars,
-              RWlock, rwlock, rwlock_with_condvars};
+import sync::{Mutex,  mutex_with_condvars,
+              RWlock, rwlock_with_condvars};
 
-export ARC, arc, clone, get;
+export ARC, clone, get;
 export Condvar;
-export MutexARC, mutex_arc, mutex_arc_with_condvars, unwrap_mutex_arc;
-export RWARC, rw_arc, rw_arc_with_condvars, RWWriteMode, RWReadMode;
+export MutexARC, mutex_arc_with_condvars, unwrap_mutex_arc;
+export RWARC, rw_arc_with_condvars, RWWriteMode, RWReadMode;
 export unwrap_rw_arc;
 
 /// As sync::condvar, a mechanism for unlock-and-descheduling and signalling.
@@ -73,7 +73,7 @@ impl &Condvar {
 struct ARC<T: const send> { x: SharedMutableState<T>; }
 
 /// Create an atomically reference counted wrapper.
-fn arc<T: const send>(+data: T) -> ARC<T> {
+fn ARC<T: const send>(+data: T) -> ARC<T> {
     ARC { x: unsafe { shared_mutable_state(data) } }
 }
 
@@ -120,7 +120,7 @@ struct MutexARCInner<T: send> { lock: Mutex; failed: bool; data: T; }
 struct MutexARC<T: send> { x: SharedMutableState<MutexARCInner<T>>; }
 
 /// Create a mutex-protected ARC with the supplied data.
-fn mutex_arc<T: send>(+user_data: T) -> MutexARC<T> {
+fn MutexARC<T: send>(+user_data: T) -> MutexARC<T> {
     mutex_arc_with_condvars(user_data, 1)
 }
 /**
@@ -249,7 +249,7 @@ struct RWARC<T: const send> {
 }
 
 /// Create a reader/writer ARC with the supplied data.
-fn rw_arc<T: const send>(+user_data: T) -> RWARC<T> {
+fn RWARC<T: const send>(+user_data: T) -> RWARC<T> {
     rw_arc_with_condvars(user_data, 1)
 }
 /**
@@ -445,7 +445,7 @@ mod tests {
     #[test]
     fn manually_share_arc() {
         let v = ~[1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
-        let arc_v = arc::arc(v);
+        let arc_v = arc::ARC(v);
 
         let (c, p) = pipes::stream();
 
@@ -469,7 +469,7 @@ mod tests {
 
     #[test]
     fn test_mutex_arc_condvar() {
-        let arc = ~mutex_arc(false);
+        let arc = ~MutexARC(false);
         let arc2 = ~arc.clone();
         let (c,p) = pipes::oneshot();
         let (c,p) = (~mut Some(c), ~mut Some(p));
@@ -491,7 +491,7 @@ mod tests {
     }
     #[test] #[should_fail] #[ignore(cfg(windows))]
     fn test_arc_condvar_poison() {
-        let arc = ~mutex_arc(1);
+        let arc = ~MutexARC(1);
         let arc2 = ~arc.clone();
         let (c,p) = pipes::stream();
 
@@ -512,7 +512,7 @@ mod tests {
     }
     #[test] #[should_fail] #[ignore(cfg(windows))]
     fn test_mutex_arc_poison() {
-        let arc = ~mutex_arc(1);
+        let arc = ~MutexARC(1);
         let arc2 = ~arc.clone();
         do task::try {
             do arc2.access |one| {
@@ -525,7 +525,7 @@ mod tests {
     }
     #[test] #[should_fail] #[ignore(cfg(windows))]
     fn test_mutex_arc_unwrap_poison() {
-        let arc = mutex_arc(1);
+        let arc = MutexARC(1);
         let arc2 = ~(&arc).clone();
         let (c,p) = pipes::stream();
         do task::spawn {
@@ -540,7 +540,7 @@ mod tests {
     }
     #[test] #[should_fail] #[ignore(cfg(windows))]
     fn test_rw_arc_poison_wr() {
-        let arc = ~rw_arc(1);
+        let arc = ~RWARC(1);
         let arc2 = ~arc.clone();
         do task::try {
             do arc2.write |one| {
@@ -553,7 +553,7 @@ mod tests {
     }
     #[test] #[should_fail] #[ignore(cfg(windows))]
     fn test_rw_arc_poison_ww() {
-        let arc = ~rw_arc(1);
+        let arc = ~RWARC(1);
         let arc2 = ~arc.clone();
         do task::try {
             do arc2.write |one| {
@@ -566,7 +566,7 @@ mod tests {
     }
     #[test] #[should_fail] #[ignore(cfg(windows))]
     fn test_rw_arc_poison_dw() {
-        let arc = ~rw_arc(1);
+        let arc = ~RWARC(1);
         let arc2 = ~arc.clone();
         do task::try {
             do arc2.write_downgrade |write_mode| {
@@ -581,7 +581,7 @@ mod tests {
     }
     #[test] #[ignore(cfg(windows))]
     fn test_rw_arc_no_poison_rr() {
-        let arc = ~rw_arc(1);
+        let arc = ~RWARC(1);
         let arc2 = ~arc.clone();
         do task::try {
             do arc2.read |one| {
@@ -594,7 +594,7 @@ mod tests {
     }
     #[test] #[ignore(cfg(windows))]
     fn test_rw_arc_no_poison_rw() {
-        let arc = ~rw_arc(1);
+        let arc = ~RWARC(1);
         let arc2 = ~arc.clone();
         do task::try {
             do arc2.read |one| {
@@ -607,7 +607,7 @@ mod tests {
     }
     #[test] #[ignore(cfg(windows))]
     fn test_rw_arc_no_poison_dr() {
-        let arc = ~rw_arc(1);
+        let arc = ~RWARC(1);
         let arc2 = ~arc.clone();
         do task::try {
             do arc2.write_downgrade |write_mode| {
@@ -623,7 +623,7 @@ mod tests {
     }
     #[test]
     fn test_rw_arc() {
-        let arc = ~rw_arc(0);
+        let arc = ~RWARC(0);
         let arc2 = ~arc.clone();
         let (c,p) = pipes::stream();
 
@@ -662,7 +662,7 @@ mod tests {
         // (4) tells writer and all other readers to contend as it downgrades.
         // (5) Writer attempts to set state back to 42, while downgraded task
         //     and all reader tasks assert that it's 31337.
-        let arc = ~rw_arc(0);
+        let arc = ~RWARC(0);
 
         // Reader tasks
         let mut reader_convos = ~[];

branches/snap-stage3/src/libstd/c_vec.rs

@@ -28,7 +28,7 @@
  */
 
 export CVec;
-export c_vec, c_vec_with_dtor;
+export CVec, c_vec_with_dtor;
 export get, set;
 export len;
 export ptr;
@@ -66,7 +66,7 @@ struct DtorRes {
  * * base - A foreign pointer to a buffer
  * * len - The number of elements in the buffer
  */
-unsafe fn c_vec<T>(base: *mut T, len: uint) -> CVec<T> {
+unsafe fn CVec<T>(base: *mut T, len: uint) -> CVec<T> {
     return CVecCtor({
         base: base,
         len: len,

branches/snap-stage3/src/libstd/ebml.rs

@@ -6,7 +6,6 @@
 import core::Option;
 import option::{Some, None};
 
-export doc;
 export Doc;
 export doc_at;
 export maybe_get_doc;
@@ -75,7 +74,7 @@ fn vuint_at(data: &[u8], start: uint) -> {val: uint, next: uint} {
     } else { error!("vint too big"); fail; }
 }
 
-fn doc(data: @~[u8]) -> Doc {
+fn Doc(data: @~[u8]) -> Doc {
     return {data: data, start: 0u, end: vec::len::<u8>(*data)};
 }
 
@@ -619,7 +618,7 @@ fn test_option_int() {
         let mbuf = io::mem_buffer();
         let ebml_w = ebml::Writer(io::mem_buffer_writer(mbuf));
         serialize_0(ebml_w, v);
-        let ebml_doc = ebml::doc(@io::mem_buffer_buf(mbuf));
+        let ebml_doc = ebml::Doc(@io::mem_buffer_buf(mbuf));
         let deser = ebml_deserializer(ebml_doc);
         let v1 = deserialize_0(deser);
         debug!("v1 == %?", v1);