---

yaml
---
r: 54185
b: refs/heads/dist-snap
c: 34c5a09
h: refs/heads/master
i:
  54183: 36dc40f
v: v3

Author: thestinger

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
 refs/heads/incoming: 44d4d6de762f3f9aae1fedcf454c66b79b3ad58d
-refs/heads/dist-snap: 4cb5854d883d275872b16a200a2bfc30c53ccea3
+refs/heads/dist-snap: 34c5a09ce3c18874de7150afbf689ce0f94c7c20
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/AUTHORS.txt

@@ -21,7 +21,6 @@ Aydin Kim <[email protected]>
 auREAX <[email protected]>
 Ben Alpert <[email protected]>
 Ben Blum <[email protected]>
-Ben Kelly <[email protected]>
 Ben Striegel <[email protected]>
 Benjamin Herr <[email protected]>
 Benjamin Jackman <[email protected]>
@@ -45,12 +44,9 @@ Daniel Brooks <[email protected]>
 Daniel Luz <[email protected]>
 Daniel Micay <[email protected]>
 Daniel Patterson <[email protected]>
-Daniel Ursache Dogariu <[email protected]>
 Dave Herman <[email protected]>
 David Forsythe <[email protected]>
-David Klein <[email protected]>
 David Rajchenbach-Teller <[email protected]>
-Dimitri Krassovski <[email protected]>
 Donovan Preston <[email protected]>
 Drew Willcoxon <[email protected]>
 Elliott Slaughter <[email protected]>
@@ -70,7 +66,6 @@ Gonçalo Cabrita <[email protected]>
 Graham Fawcett <[email protected]>
 Grahame Bowland <[email protected]>
 Haitao Li <[email protected]>
-hansjorg <[email protected]>
 Huon Wilson <[email protected]>
 Ian D. Bollinger <[email protected]>
 Ilyong Cho <[email protected]>
@@ -85,14 +80,11 @@ Jeff Balogh <[email protected]>
 Jeff Muizelaar <[email protected]>
 Jeff Olson <[email protected]>
 Jeffrey Yasskin <[email protected]>
-Jeong YunWon <[email protected]>
 Jens Nockert <[email protected]>
 Jesse Jones <[email protected]>
 Jesse Ruderman <[email protected]>
-Jihyun Yu <[email protected]>
 Jim Blandy <[email protected]>
 Jimmy Lu <[email protected]>
-J. J. Weber <[email protected]>
 Joe Pletcher <[email protected]>
 John Clements <[email protected]>
 Jon Morton <[email protected]>
@@ -107,7 +99,6 @@ Kevin Atkinson <[email protected]>
 Kevin Cantu <[email protected]>
 Kyeongwoon Lee <[email protected]>
 Laurent Bonnans <[email protected]>
-Lawrence Velázquez <[email protected]>
 Lennart Kudling <[email protected]>
 Lindsey Kuper <[email protected]>
 Luca Bruno <[email protected]>
@@ -121,9 +112,7 @@ Mark Vian <[email protected]>
 Martin DeMello <[email protected]>
 Marvin Löbel <[email protected]>
 Matt Brubeck <[email protected]>
-Matthew McPherrin <[email protected]>
 Matthew O'Connor <[email protected]>
-Matthijs Hofstra <[email protected]>
 Max Penet <[email protected]>
 Michael Arntzenius <[email protected]>
 Michael Bebenita <[email protected]>
@@ -132,7 +121,6 @@ Michael Sullivan <[email protected]>
 Mikko Perttunen <[email protected]>
 Nick Desaulniers <[email protected]>
 Niko Matsakis <[email protected]>
-Olivier Saut <[email protected]>
 Or Brostovski <[email protected]>
 Orphée Lafond-Lummis <[email protected]>
 Patrick Walton <[email protected]>
@@ -152,17 +140,14 @@ Roy Frostig <[email protected]>
 Ryan Scheel <[email protected]>
 Sean Stangl <[email protected]>
 Sebastian N. Fernandez <[email protected]>
-Seth Pink <[email protected]>
 Seo Sanghyeon <[email protected]>
-sevrak <[email protected]>
 Simon Barber-Dueck <[email protected]>
 Simon Sapin <[email protected]>
 startling <[email protected]>
 Stefan Plantikow <[email protected]>
 Steve Klabnik <[email protected]>
 Taras Shpot <[email protected]>
 Ted Horst <[email protected]>
-Thad Guidry <[email protected]>
 Tim Chevalier <[email protected]>
 Tim Taubert <[email protected]>
 Tom Lee <[email protected]>
@@ -176,6 +161,5 @@ Vincent Belliard <[email protected]>
 Wade Mealing <[email protected]>
 William Ting <[email protected]>
 Yasuhiro Fujii <[email protected]>
-Young-il Choi <[email protected]>
 Youngsoo Son <[email protected]>
 Zack Corr <[email protected]>

branches/dist-snap/RELEASES.txt

@@ -1,22 +1,28 @@
 Version 0.6 (March 2013)
 ---------------------------
 
-   * ~2100 changes, numerous bugfixes
+   * ~2000 changes, numerous bugfixes
+
+   * TODO:
+      * Ord/Cmp
+      * Lifetime changes
+      * Remove `static` keyword
+      * Static method syntax
+      * `as Trait`
+      * `copy` removed, replaced with `Clone`?
+      * 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.
-      * Static methods no longer require the `static` keyword and instead
-        are distinguished by the lack of a `self` parameter
       * 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
       * `super` is a keyword, and may be prefixed to paths
       * Trait bounds are separated with `+` instead of whitespace
       * Traits are implemented with `impl Trait for Type`
         instead of `impl Type: Trait`
-      * Lifetime syntax is now `&'l foo` instead of `&l/foo`
       * The `export` keyword has finally been removed
       * The `move` keyword has been removed (see "Semantic changes")
       * The interior mutability qualifier on vectors, `[mut T]`, has been
@@ -35,11 +41,9 @@ Version 0.6 (March 2013)
       * Pattern matching over vectors improved and expanded
       * `const` renamed to `static` to correspond to lifetime name,
         and make room for future `static mut` unsafe mutable globals.
-      * Replaced `#[deriving_eq]` with `#[deriving(Eq)]`, etc.
+      * Replaced `#[deriving_eq]` with `#[deriving(Eq)]`
       * `Clone` implementations can be automatically generated with
         `#[deriving(Clone)]`
-      * Casts to traits must use a pointer sigil, e.g. `@foo as @Bar`
-        instead of `foo as Bar`.
 
    * Semantic changes
       * Types with owned pointers or custom destructors move by default,
@@ -50,11 +54,7 @@ Version 0.6 (March 2013)
       * () has size 0
       * The name of the main function can be customized using #[main]
       * The default type of an inferred closure is &fn instead of @fn
-      * `use` statements may no longer be "chained" - they cannot import
-        identifiers imported by previous `use` statements
-      * `use` statements are crate relative, importing from the "top"
-        of the crate by default. Paths may be prefixed with `super::`
-        or `self::` to change the search behavior.
+      * Name resolution continues to be tweaked
       * Method visibility is inherited from the implementation declaration
       * Structural records have been removed
       * Many more types can be used in static items, including enums
@@ -78,15 +78,14 @@ Version 0.6 (March 2013)
       * `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`
-      * `Ord` split into `Ord` and `TotalOrd`. `Ord` is still used to
-        overload the comparison operators, whereas `TotalOrd` is used
-        by certain container types
 
-   * Other
+   * Tools
       * Replaced the 'cargo' package manager with 'rustpkg'
       * Added all-purpose 'rust' tool
       * `rustc --test` now supports benchmarks with the `#[bench]` attribute
-      * rustc now *attempts* to offer spelling suggestions
+      * 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

branches/dist-snap/src/compiletest/compiletest.rc

@@ -90,9 +90,7 @@ pub fn parse_config(args: ~[~str]) -> config {
              if vec::len(matches.free) > 0u {
                  option::Some(matches.free[0])
              } else { option::None },
-        logfile: option::map(&getopts::opt_maybe_str(matches,
-                                                     ~"logfile"),
-                             |s| Path(*s)),
+        logfile: getopts::opt_maybe_str(matches, ~"logfile").map(|s| Path(*s)),
         runtool: getopts::opt_maybe_str(matches, ~"runtool"),
         rustcflags: getopts::opt_maybe_str(matches, ~"rustcflags"),
         jit: getopts::opt_present(matches, ~"jit"),

branches/dist-snap/src/libcore/cell.rs

@@ -11,7 +11,6 @@
 //! A mutable, nullable memory location
 
 use cast::transmute;
-use option;
 use prelude::*;
 
 /*
@@ -53,7 +52,7 @@ pub impl<T> Cell<T> {
 
         let mut value = None;
         value <-> self.value;
-        return option::unwrap(value);
+        value.unwrap()
     }
 
     /// Returns the value, failing if the cell is full.

branches/dist-snap/src/libcore/comm.rs

@@ -15,8 +15,7 @@ Message passing
 use cast;
 use either::{Either, Left, Right};
 use kinds::Owned;
-use option;
-use option::{Option, Some, None, unwrap};
+use option::{Option, Some, None};
 use uint;
 use unstable;
 use vec;
@@ -126,7 +125,7 @@ fn chan_send<T:Owned>(self: &Chan<T>, x: T) {
     let mut endp = None;
     endp <-> self.endp;
     self.endp = Some(
-        streamp::client::data(unwrap(endp), x))
+        streamp::client::data(endp.unwrap(), x))
 }
 
 impl<T: Owned> GenericSmartChan<T> for Chan<T> {
@@ -139,7 +138,7 @@ impl<T: Owned> GenericSmartChan<T> for Chan<T> {
 fn chan_try_send<T:Owned>(self: &Chan<T>, x: T) -> bool {
     let mut endp = None;
     endp <-> self.endp;
-    match streamp::client::try_data(unwrap(endp), x) {
+    match streamp::client::try_data(endp.unwrap(), x) {
         Some(next) => {
             self.endp = Some(next);
             true
@@ -165,7 +164,7 @@ impl<T: Owned> GenericPort<T> for Port<T> {
 fn port_recv<T:Owned>(self: &Port<T>) -> T {
     let mut endp = None;
     endp <-> self.endp;
-    let streamp::data(x, endp) = recv(unwrap(endp));
+    let streamp::data(x, endp) = recv(endp.unwrap());
     self.endp = Some(endp);
     x
 }
@@ -174,7 +173,7 @@ fn port_recv<T:Owned>(self: &Port<T>) -> T {
 fn port_try_recv<T:Owned>(self: &Port<T>) -> Option<T> {
     let mut endp = None;
     endp <-> self.endp;
-    match try_recv(unwrap(endp)) {
+    match try_recv(endp.unwrap()) {
         Some(streamp::data(x, endp)) => {
             self.endp = Some(endp);
             Some(x)
@@ -312,7 +311,7 @@ fn shared_chan_send<T:Owned>(self: &SharedChan<T>, x: T) {
     do self.with_imm |chan| {
         let mut x = None;
         x <-> xx;
-        chan.send(option::unwrap(x))
+        chan.send(x.unwrap())
     }
 }
 
@@ -326,7 +325,7 @@ fn shared_chan_try_send<T:Owned>(self: &SharedChan<T>, x: T) -> bool {
     do self.with_imm |chan| {
         let mut x = None;
         x <-> xx;
-        chan.try_send(option::unwrap(x))
+        chan.try_send(x.unwrap())
     }
 }
 
@@ -409,7 +408,7 @@ pub fn try_recv_one<T: Owned> (port: PortOne<T>) -> Option<T> {
 
     if message.is_none() { None }
     else {
-        let oneshot::send(message) = option::unwrap(message);
+        let oneshot::send(message) = message.unwrap();
         Some(message)
     }
 }

branches/dist-snap/src/libcore/dlist.rs

@@ -23,7 +23,6 @@ use iter::BaseIter;
 use kinds::Copy;
 use managed;
 use option::{None, Option, Some};
-use option;
 use vec;
 
 pub type DListLink<T> = Option<@mut DListNode<T>>;
@@ -377,7 +376,7 @@ pub impl<T> DList<T> {
 
     /// Reverse the list's elements in place. O(n).
     fn reverse(@mut self) {
-        do option::while_some(self.hd) |nobe| {
+        do self.hd.while_some |nobe| {
             let next_nobe = nobe.next;
             self.remove(nobe);
             self.make_mine(nobe);
@@ -509,8 +508,8 @@ impl<T> BaseIter<T> for @mut DList<T> {
     */
     fn each(&self, f: &fn(v: &T) -> bool) {
         let mut link = self.peek_n();
-        while option::is_some(&link) {
-            let nobe = option::get(link);
+        while link.is_some() {
+            let nobe = link.get();
             fail_unless!(nobe.linked);
 
             {

branches/dist-snap/src/libcore/gc.rs

@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[doc(hidden)];
-
 /*! Precise garbage collector
 
 The precise GC exposes two functions, gc and