---

yaml
---
r: 50150
b: refs/heads/auto
c: 5b43810
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -14,5 +14,5 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 705c796ffa78417592b9e36d975cd432a4dc8417
+refs/heads/auto: 5b43810841a7825d37ecc6564b246a1a5f109667
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167

branches/auto/RELEASES.txt

@@ -6,15 +6,16 @@ Version 0.6 (March 2013)
    * TODO:
       * Ord/Cmp
       * Lifetime changes
-      * Implicit self
       * Remove `static` keyword
       * Static method syntax
       * `as Trait`
       * `copy` removed, replaced with `Clone`?
-      * `std::map` removed, replaced with `core::hashmap`
+      * More details for "Name resolution continues to be tweaked"?
 
    * Syntax changes
       * The self type parameter in traits is now spelled `Self`
+      * The `self` parameter in trait and impl methods must now be explicitly
+        named (for example: `fn f(&self) { }`). Implicit self is deprecated.
       * Replaced the `Durable` trait with the `'static` lifetime
       * The old closure type syntax with the trailing sigil has been
         removed in favor of the more consistent leading sigil
@@ -23,7 +24,7 @@ Version 0.6 (March 2013)
       * Traits are implemented with `impl Trait for Type`
         instead of `impl Type: Trait`
       * The `export` keyword has finally been removed
-      * The `move` keyword has been removed (linear types move by default)
+      * The `move` keyword has been removed (see "Semantic changes")
       * The interior mutability qualifier on vectors, `[mut T]`, has been
         removed. Use `&mut [T]`, etc.
       * `mut` is no longer valid in `~mut T`. Use inherited mutability
@@ -37,6 +38,7 @@ Version 0.6 (March 2013)
         function modules. Use extern blocks: `extern { ... }`
       * Newtype enums removed. Used tuple-structs.
       * Trait implementations no longer support visibility modifiers
+      * Pattern matching over vectors improved and expanded
 
    * Semantic changes
       * Types with owned pointers or custom destructors move by default,
@@ -49,12 +51,9 @@ Version 0.6 (March 2013)
       * The default type of an inferred closure is &fn instead of @fn
       * Name resolution continues to be tweaked
       * Method visibility is inherited from the implementation declaration
-
-   * Other language changes
       * Structural records have been removed
-      * Many more types can be used in constants, including enums
+      * Many more types can be used in constants, including enums,
         `static lifetime pointers and vectors
-      * Pattern matching over vectors improved and expanded
       * Typechecking of closure types has been overhauled to
         improve inference and eliminate unsoundness
 
@@ -68,6 +67,7 @@ Version 0.6 (March 2013)
       * Containers reorganized around traits in `core::container`
       * `core::dvec` removed, `~[T]` is a drop-in replacement
       * `core::send_map` renamed to `core::hashmap`
+      * `std::map` removed; replaced with `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
@@ -76,14 +76,14 @@ Version 0.6 (March 2013)
    * Tools
       * Replaced the 'cargo' package manager with 'rustpkg'
       * Added all-purpose 'rust' tool
-      * `rustc --test` now supports a benchmarks with the `#[bench]` attribute
+      * `rustc --test` now supports benchmarks with the `#[bench]` attribute
       * rustc now attempts to offer spelling suggestions
 
    * Misc
       * Improved support for ARM and Android
       * Preliminary MIPS backend
       * Improved foreign function ABI implementation for x86, x86_64
-      * Various and memory usage improvements
+      * Various memory usage improvements
       * Rust code may be embedded in foreign code under limited circumstances
 
 Version 0.5 (December 2012)

branches/auto/configure

@@ -519,7 +519,7 @@ then
                       | cut -d ' ' -f 2)
 
     case $CFG_CLANG_VERSION in
-        (3.0svn | 3.0 | 3.1* | 3.2* | 4.0* | 4.1* | 4.2*)
+        (3.0svn | 3.0 | 3.1* | 3.2* | 3.3* | 4.0* | 4.1* | 4.2*)
         step_msg "found ok version of CLANG: $CFG_CLANG_VERSION"
         CFG_C_COMPILER="clang"
         ;;

branches/auto/src/libcore/trie.rs

@@ -12,6 +12,7 @@
 
 use prelude::*;
 
+// FIXME: #3469: need to manually update TrieNode when SHIFT changes
 // FIXME: #5244: need to manually update the TrieNode constructor
 const SHIFT: uint = 4;
 const SIZE: uint = 1 << SHIFT;
@@ -161,15 +162,12 @@ pub struct TrieSet {
 
 impl BaseIter<uint> for TrieSet {
     /// Visit all values in order
-    #[inline(always)]
     fn each(&self, f: &fn(&uint) -> bool) { self.map.each_key(f) }
-    #[inline(always)]
     fn size_hint(&self) -> Option<uint> { Some(self.len()) }
 }
 
 impl ReverseIter<uint> for TrieSet {
     /// Visit all values in reverse order
-    #[inline(always)]
     fn each_reverse(&self, f: &fn(&uint) -> bool) {
         self.map.each_key_reverse(f)
     }
@@ -191,7 +189,7 @@ impl Mutable for TrieSet {
     fn clear(&mut self) { self.map.clear() }
 }
 
-pub impl TrieSet {
+impl TrieSet {
     /// Create an empty TrieSet
     #[inline(always)]
     fn new() -> TrieSet {
@@ -217,7 +215,7 @@ pub impl TrieSet {
 
 struct TrieNode<T> {
     count: uint,
-    children: [Child<T> * SIZE]
+    children: [Child<T> * 16] // FIXME: #3469: can't use the SIZE constant yet
 }
 
 impl<T> TrieNode<T> {
@@ -303,6 +301,7 @@ fn insert<T>(count: &mut uint, child: &mut Child<T>, key: uint, value: T,
         added = insert(&mut x.count, &mut x.children[chunk(key, idx)], key,
                        value, idx + 1);
         Internal(x)
+
       }
       Nothing => {
         *count += 1;

branches/auto/src/libstd/priority_queue.rs

@@ -112,7 +112,7 @@ pub impl <T:Ord> PriorityQueue<T> {
         while end > 1 {
             end -= 1;
             q.data[end] <-> q.data[0];
-            q.siftdown_range(0, end)
+            unsafe { q.siftdown_range(0, end) } // purity-checking workaround
         }
         q.to_vec()
     }
@@ -126,7 +126,7 @@ pub impl <T:Ord> PriorityQueue<T> {
         let mut n = q.len() / 2;
         while n > 0 {
             n -= 1;
-            q.siftdown(n)
+            unsafe { q.siftdown(n) }; // purity-checking workaround
         }
         q
     }