---

yaml
---
r: 48767
b: refs/heads/snap-stage3
c: d597a19
h: refs/heads/master
i:
  48765: 8f320af
  48763: a4f39bb
  48759: 0199f0a
  48751: b074b1d
  48735: 3975822
  48703: 102cf45
  48639: 5ba7898
v: v3

Author: z0w0

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 3bbcac322669cff3abde5be937cc4ec3860f3985
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: ebba8b4e3591c95508a4c1121784e768272a574a
+refs/heads/snap-stage3: d597a19b3062327f5fc26bc963bc5859ad3f6c04
 refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/RELEASES.txt

@@ -10,8 +10,7 @@ Version 0.6 (March 2013)
       * Remove `static` keyword
       * Static method syntax
       * `as Trait`
-      * `copy` removed, replaced with `Clone`?
-      * `std::map` removed, replaced with `core::hashmap`
+      * `copy` removed?
 
    * Syntax changes
       * The self type parameter in traits is now spelled `Self`
@@ -39,8 +38,7 @@ Version 0.6 (March 2013)
       * Trait implementations no longer support visibility modifiers
 
    * Semantic changes
-      * Types with owned pointers or custom destructors move by default,
-        eliminating the `move` keyword
+      * Linear types move by default, eliminating the `move` keyword
       * All foreign functions are considered unsafe
       * &mut is now unaliasable
       * Writes to borrowed @mut pointers are prevented dynamically
@@ -59,19 +57,16 @@ Version 0.6 (March 2013)
         improve inference and eliminate unsoundness
 
    * Libraries
+      * Lots of effort to organize the container API's around `core::container`
+      * `core::send_map` renamed to `core::hashmap`
       * Added big integers to `std::bigint`
       * Removed `core::oldcomm` module
       * Added pipe-based `core::comm` module
+      * Reimplemented `std::treemap`
       * Numeric traits have been reorganized under `core::num`
+      * `core::dvec` removed. Use `@mut ~[T]` or other language types
       * `vec::slice` finally returns a slice
       * `debug!` and friends don't require a format string, e.g. `debug!(Foo)`
-      * Containers reorganized around traits in `core::container`
-      * `core::dvec` removed, `~[T]` is a drop-in replacement
-      * `core::send_map` renamed to `core::hashmap`
-      * `std::treemap` reimplemented as an owned balanced tree
-      * `std::deque` and `std::smallintmap` reimplemented as owned containers
-      * `core::trie` added as a fast ordered map for integer keys
-      * Set types added to `core::hashmap`, `core::trie` and `std::treemap`
 
    * Tools
       * Replaced the 'cargo' package manager with 'rustpkg'

branches/snap-stage3/mk/rt.mk

@@ -132,7 +132,7 @@ rt/$(1)/%.o: rt/%.S  $$(MKFILE_DEPS) \
 
 rt/$(1)/arch/$$(HOST_$(1))/libmorestack.a: $$(MORESTACK_OBJ_$(1))
 	@$$(call E, link: $$@)
-	$$(Q)$(AR_$(1)) rcs $$@ $$<
+	$$(Q)ar rcs $$@ $$<
 
 rt/$(1)/$(CFG_RUNTIME_$(1)): $$(RUNTIME_OBJS_$(1)) $$(MKFILE_DEPS) \
                         $$(RUNTIME_DEF_$(1)) \

branches/snap-stage3/src/libcore/clone.rs

@@ -20,11 +20,6 @@ impl Clone for () {
     fn clone(&self) -> () { () }
 }
 
-impl<T:Clone> Clone for ~T {
-    #[inline(always)]
-    fn clone(&self) -> ~T { ~(**self).clone() }
-}
-
 macro_rules! clone_impl(
     ($t:ty) => {
         impl Clone for $t {

branches/snap-stage3/src/libcore/container.rs

@@ -35,9 +35,6 @@ pub trait Map<K, V>: Mutable {
     /// Visit all values
     pure fn each_value(&self, f: &fn(&V) -> bool);
 
-    /// Iterate over the map and mutate the contained values
-    fn mutate_values(&mut self, f: &fn(&K, &mut V) -> bool);
-
     /// Return the value corresponding to the key in the map
     pure fn find(&self, key: &K) -> Option<&self/V>;
 

branches/snap-stage3/src/libcore/core.rc

@@ -56,7 +56,6 @@ Implicitly, all crates behave as if they included the following prologue:
 
 // On Linux, link to the runtime with -lrt.
 #[cfg(target_os = "linux")]
-#[doc(hidden)]
 pub mod linkhack {
     #[link_args="-lrustrt -lrt"]
     #[link_args = "-lpthread"]
@@ -253,7 +252,7 @@ pub mod rt;
 // A curious inner-module that's not exported that contains the binding
 // 'core' so that macro-expanded references to core::error and such
 // can be resolved within libcore.
-#[doc(hidden)]
+#[doc(hidden)] // FIXME #3538
 pub mod core {
     #[cfg(stage0)]
     pub const error : u32 = 1_u32;

branches/snap-stage3/src/libcore/hashmap.rs

@@ -325,19 +325,6 @@ pub mod linear {
             self.each(|&(_, v)| blk(v))
         }
 
-        /// Iterate over the map and mutate the contained values
-        fn mutate_values(&mut self, blk: &fn(&'self K,
-                              &'self mut V) -> bool) {
-            for uint::range(0, self.buckets.len()) |i| {
-                match self.buckets[i] {
-                  Some(Bucket{key: ref key, value: ref mut value, _}) => {
-                    if !blk(key, value) { return }
-                  }
-                  None => ()
-                }
-            }
-        }
-
         /// Return the value corresponding to the key in the map
         pure fn find(&self, k: &K) -> Option<&self/V> {
             match self.bucket_for_key(k) {

branches/snap-stage3/src/libcore/iter.rs

@@ -31,10 +31,6 @@ pub trait ReverseIter<A>: BaseIter<A> {
     pure fn each_reverse(&self, blk: &fn(&A) -> bool);
 }
 
-pub trait MutableIter<A>: BaseIter<A> {
-    fn each_mut(&mut self, blk: &fn(&mut A) -> bool);
-}
-
 pub trait ExtendedIter<A> {
     pure fn eachi(&self, blk: &fn(uint, v: &A) -> bool);
     pure fn all(&self, blk: &fn(&A) -> bool) -> bool;

branches/snap-stage3/src/libcore/option.rs

@@ -46,7 +46,7 @@ use ops::Add;
 use kinds::Copy;
 use util;
 use num::Zero;
-use iter::{BaseIter, MutableIter};
+use iter::BaseIter;
 
 #[cfg(test)] use ptr;
 #[cfg(test)] use str;
@@ -323,13 +323,6 @@ impl<T> BaseIter<T> for Option<T> {
     }
 }
 
-impl<T> MutableIter<T> for Option<T> {
-    #[inline(always)]
-    fn each_mut(&mut self, f: &fn(&'self mut T) -> bool) {
-        match *self { None => (), Some(ref mut t) => { f(t); } }
-    }
-}
-
 pub impl<T> Option<T> {
     /// Returns true if the option equals `none`
     #[inline(always)]

branches/snap-stage3/src/libcore/prelude.rs

@@ -27,9 +27,8 @@ pub use clone::Clone;
 pub use cmp::{Eq, Ord, TotalOrd, Ordering, Less, Equal, Greater};
 pub use container::{Container, Mutable, Map, Set};
 pub use hash::Hash;
-pub use iter::{BaseIter, ReverseIter, MutableIter, ExtendedIter, EqIter};
-pub use iter::{CopyableIter, CopyableOrderedIter, CopyableNonstrictIter};
-pub use iter::Times;
+pub use iter::{BaseIter, ReverseIter, ExtendedIter, EqIter, CopyableIter};
+pub use iter::{CopyableOrderedIter, CopyableNonstrictIter, Times};
 pub use num::NumCast;
 pub use path::GenericPath;
 pub use path::Path;
@@ -44,10 +43,6 @@ pub use vec::{CopyableVector, ImmutableVector};
 pub use vec::{ImmutableEqVector, ImmutableCopyableVector};
 pub use vec::{OwnedVector, OwnedCopyableVector};
 
-/* Reexported runtime types */
-pub use comm::{stream, Port, Chan, GenericChan, GenericSmartChan, GenericPort, Peekable};
-pub use task::spawn;
-
 /* Reexported modules */
 
 pub use at_vec;

branches/snap-stage3/src/libcore/rt/thread_local_storage.rs

@@ -40,7 +40,6 @@ type pthread_key_t = c_ulong;
 
 #[cfg(target_os="linux")]
 #[cfg(target_os="freebsd")]
-#[cfg(target_os="android")]
 #[allow(non_camel_case_types)] // foreign type
 type pthread_key_t = c_uint;
 

branches/snap-stage3/src/libcore/str.rs

@@ -20,7 +20,6 @@
 use at_vec;
 use cast;
 use char;
-use clone::Clone;
 use cmp::{Equiv, TotalOrd, Ordering, Less, Equal, Greater};
 use libc;
 use option::{None, Option, Some};
@@ -2274,7 +2273,6 @@ pub trait StrSlice {
     pure fn to_owned(&self) -> ~str;
     pure fn to_managed(&self) -> @str;
     pure fn char_at(&self, i: uint) -> char;
-    fn to_bytes(&self) -> ~[u8];
 }
 
 /// Extension methods for strings
@@ -2418,8 +2416,6 @@ impl StrSlice for &self/str {
 
     #[inline]
     pure fn char_at(&self, i: uint) -> char { char_at(*self, i) }
-
-    fn to_bytes(&self) -> ~[u8] { to_bytes(*self) }
 }
 
 pub trait OwnedStr {
@@ -2437,13 +2433,6 @@ impl OwnedStr for ~str {
     }
 }
 
-impl Clone for ~str {
-    #[inline(always)]
-    fn clone(&self) -> ~str {
-        self.to_str()  // hilarious
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use char;

branches/snap-stage3/src/libcore/trie.rs

@@ -81,16 +81,11 @@ impl<T> Map<uint, T> for TrieMap<T> {
 
     /// Visit all values in order
     #[inline(always)]
-    pure fn each_value(&self, f: &fn(&T) -> bool) {
+    pure fn each_value(&self,
+                       f: &fn(&T) -> bool) {
         self.each(|&(_, v)| f(v))
     }
 
-    /// Iterate over the map and mutate the contained values
-    #[inline(always)]
-    fn mutate_values(&mut self, f: &fn(&uint, &mut T) -> bool) {
-        self.root.mutate_values(f);
-    }
-
     /// Return the value corresponding to the key in the map
     #[inline(hint)]
     pure fn find(&self, key: &uint) -> Option<&self/T> {
@@ -137,7 +132,6 @@ impl<T> Map<uint, T> for TrieMap<T> {
 }
 
 impl<T> TrieMap<T> {
-    /// Create an empty TrieMap
     #[inline(always)]
     static pure fn new() -> TrieMap<T> {
         TrieMap{root: TrieNode::new(), length: 0}
@@ -156,6 +150,11 @@ impl<T> TrieMap<T> {
     pure fn each_value_reverse(&self, f: &fn(&T) -> bool) {
         self.each_reverse(|&(_, v)| f(v))
     }
+
+    /// Iterate over the map and mutate the contained values
+    fn mutate_values(&mut self, f: &fn(uint, &mut T) -> bool) {
+        self.root.mutate_values(f);
+    }
 }
 
 pub struct TrieSet {
@@ -192,12 +191,6 @@ impl Mutable for TrieSet {
 }
 
 impl TrieSet {
-    /// Create an empty TrieSet
-    #[inline(always)]
-    static pure fn new() -> TrieSet {
-        TrieSet{map: TrieMap::new()}
-    }
-
     /// Return true if the set contains a value
     #[inline(always)]
     pure fn contains(&self, value: &uint) -> bool {
@@ -255,13 +248,13 @@ impl<T> TrieNode<T> {
         true
     }
 
-    fn mutate_values(&mut self, f: &fn(&uint, &mut T) -> bool) -> bool {
+    fn mutate_values(&mut self, f: &fn(uint, &mut T) -> bool) -> bool {
         for vec::each_mut(self.children) |child| {
             match *child {
                 Internal(ref mut x) => if !x.mutate_values(f) {
                     return false
                 },
-                External(k, ref mut v) => if !f(&k, v) { return false },
+                External(k, ref mut v) => if !f(k, v) { return false },
                 Nothing => ()
             }
         }
@@ -272,12 +265,12 @@ impl<T> TrieNode<T> {
 // if this was done via a trait, the key could be generic
 #[inline(always)]
 pure fn chunk(n: uint, idx: uint) -> uint {
-    let sh = uint::bits - (SHIFT * (idx + 1));
-    (n >> sh) & MASK
+    let real_idx = uint::bytes - 1 - idx;
+    (n >> (SHIFT * real_idx)) & MASK
 }
 
-fn insert<T>(count: &mut uint, child: &mut Child<T>, key: uint, value: T,
-             idx: uint) -> bool {
+fn insert<T>(count: &mut uint, child: &mut Child<T>, key: uint,
+                   value: T, idx: uint) -> bool {
     let mut tmp = Nothing;
     tmp <-> *child;
     let mut added = false;
@@ -469,26 +462,4 @@ mod tests {
             n -= 1;
         }
     }
-
-    #[test]
-    fn test_sane_chunk() {
-        let x = 1;
-        let y = 1 << (uint::bits - 1);
-
-        let mut trie = TrieSet::new();
-
-        fail_unless!(trie.insert(x));
-        fail_unless!(trie.insert(y));
-
-        fail_unless!(trie.len() == 2);
-
-        let expected = [x, y];
-
-        let mut i = 0;
-
-        for trie.each |x| {
-            fail_unless!(expected[i] == *x);
-            i += 1;
-        }
-    }
 }

branches/snap-stage3/src/libcore/unstable/global.rs

@@ -68,11 +68,11 @@ unsafe fn global_data_clone_create_<T:Owned + Clone>(
         match value {
             None => {
                 let value = create();
-                clone_value = Some((*value).clone());
+                clone_value = Some(value.clone());
                 Some(value)
             }
             Some(value) => {
-                clone_value = Some((*value).clone());
+                clone_value = Some(value.clone());
                 Some(value)
             }
         }
@@ -193,7 +193,7 @@ fn get_global_state() -> Exclusive<GlobalState> {
             // Successfully installed the global pointer
 
             // Take a handle to return
-            let clone = (*state).clone();
+            let clone = state.clone();
 
             // Install a runtime exit function to destroy the global object
             do at_exit {