---

yaml
---
r: 51073
b: refs/heads/try
c: 8896336
h: refs/heads/master
i:
  51071: 61bca62
v: v3

Author: bors

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 5f13e9ccc2e3328d4cd8ca49f84e6840dd998346
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: f7a2371c176663d59062ec5158f39faecba45768
-refs/heads/try: 09255dbe2d7a94cf6a3d8bf426e428f1a50d3e8c
+refs/heads/try: 88963367707c65ad9e84eb2f9f01a5874e90dd96
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/RELEASES.txt

@@ -62,6 +62,8 @@ Version 0.6 (March 2013)
       * Pattern matching over vectors improved and expanded
       * Typechecking of closure types has been overhauled to
         improve inference and eliminate unsoundness
+      * Macros leave scope at the end of modules, unless that module is
+        tagged with #[macro_escape]
 
    * Libraries
       * Added big integers to `std::bigint`

branches/try/configure

@@ -308,8 +308,6 @@ case $CFG_OSTYPE in
 esac
 
 
-if [ -z "$CFG_CPUTYPE" ]
-then
 case $CFG_CPUTYPE in
 
     i386 | i486 | i686 | i786 | x86)
@@ -327,7 +325,6 @@ case $CFG_CPUTYPE in
     *)
         err "unknown CPU type: $CFG_CPUTYPE"
 esac
-fi
 
 # Detect 64 bit linux systems with 32 bit userland and force 32 bit compilation
 if [ $CFG_OSTYPE = unknown-linux-gnu -a $CFG_CPUTYPE = x86_64 ]
@@ -575,7 +572,7 @@ fi
 CFG_PREFIX=${CFG_PREFIX%/}
 CFG_HOST_TRIPLES="$(echo $CFG_HOST_TRIPLES | tr ',' ' ')"
 CFG_TARGET_TRIPLES="$(echo $CFG_TARGET_TRIPLES | tr ',' ' ')"
-CFG_SUPPORTED_TARGET_TRIPLES="$(grep ^CC_*=* $CFG_SRC_DIR/mk/platform.mk | sed 's,^[^_]*_,,' | sed 's/\([^=]*\).*/\1/' | xargs)"
+CFG_SUPPORTED_TARGET_TRIPLES="$(grep ^CC_*=* $CFG_SRC_DIR/mk/platform.mk | sed -e 's/^CC_//' -e 's/\([^=]*\).*/\1/' | xargs)"
 
 # copy host-triples to target-triples so that hosts are a subset of targets
 V_TEMP=""

branches/try/src/libcore/hashmap.rs

@@ -8,7 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-//! Sendable hash maps.
+//! An unordered map and set type implemented as hash tables
+//!
+//! The tables use a keyed hash with new random keys generated for each container, so the ordering
+//! of a set of keys in a hash table is randomized.
 
 /// Open addressing with linear probing.
 pub mod linear {

branches/try/src/libcore/ops.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// Core operators
+//! Traits for the built-in operators
 
 #[lang="drop"]
 pub trait Drop {

branches/try/src/libstd/base64.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+//! Base64 binary-to-text encoding
+
 use core::iter;
 use core::str;
 use core::vec;

branches/try/src/libsyntax/parse/parser.rs

@@ -3214,10 +3214,6 @@ pub impl Parser {
                   }
                 }
             }
-            if fields.len() == 0 {
-                self.fatal(fmt!("Unit-like struct should be written as: struct %s;",
-                                *self.interner.get(class_name)));
-            }
             self.bump();
         } else if *self.token == token::LPAREN {
             // It's a tuple-like struct.

branches/try/src/test/compile-fail/block-must-not-have-result-res.rs

@@ -10,7 +10,7 @@
 
 // error-pattern:mismatched types: expected `()` but found `bool`
 
-struct r;
+struct r {}
 
 impl Drop for r {
     fn finalize(&self) {

branches/try/src/test/compile-fail/obsolete-syntax.rs

@@ -31,11 +31,9 @@ struct s {
 
 struct q : r {
     //~^ ERROR obsolete syntax: class traits
-    foo: int
 }
 
 struct sss {
-    bar: int,
     priv {
     //~^ ERROR obsolete syntax: private section
         foo: ()