---

yaml
---
r: 139355
b: refs/heads/try2
c: 969e8b7
h: refs/heads/master
i:
  139353: 384dd92
  139351: f5c792e
v: v3

Author: jbclements

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 30b1957cd447f91d206513d909f564d270410e82
+refs/heads/try2: 969e8b76a184ce3083c7854a986baf3f279b5c81
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/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/try2/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,18 +54,16 @@ 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
         '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
+      * Macros leave scope at the end of modules, unless that module is
+        tagged with #[macro_escape]
 
    * Libraries
       * Added big integers to `std::bigint`
@@ -78,15 +80,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/try2/doc/rust.css

@@ -101,9 +101,4 @@ td {
 #TOC ul {
     list-style: none;
     padding-left: 0px;
-}
-
-/* Adjust list alignment so rustdoc indexes don't align with blockquotes */
-div.index ul {
-    padding-left: 1em;
 }

branches/try2/doc/rust.md

@@ -441,11 +441,11 @@ expression context, the final namespace qualifier is omitted.
 Two examples of paths with type arguments:
 
 ~~~~
-# use core::hashmap::linear::LinearMap;
+# use std::oldmap;
 # fn f() {
 # fn id<T:Copy>(t: T) -> T { t }
-type t = LinearMap<int,~str>;  // Type arguments used in a type expression
-let x = id::<int>(10);         // Type arguments used in a call expression
+type t = oldmap::HashMap<int,~str>;  // Type arguments used in a type expression
+let x = id::<int>(10);           // Type arguments used in a call expression
 # }
 ~~~~
 
@@ -830,12 +830,12 @@ An example of re-exporting:
 ~~~~
 # fn main() { }
 mod quux {
-    pub use quux::foo::*;
-
     pub mod foo {
         pub fn bar() { }
         pub fn baz() { }
     }
+
+    pub use quux::foo::*;
 }
 ~~~~
 
@@ -1116,7 +1116,7 @@ static bit2: uint = 1 << 1;
 static bits: [uint, ..2] = [bit1, bit2];
 static string: &'static str = "bitstring";
 
-struct BitsNStrings<'self> {
+struct BitsNStrings {
     mybits: [uint, ..2],
     mystring: &'self str
 }
@@ -1671,10 +1671,6 @@ vec_elems : [expr [',' expr]*] | [expr ',' ".." expr]
 A [_vector_](#vector-types) _expression_ is written by enclosing zero or
 more comma-separated expressions of uniform type in square brackets.
 
-In the `[expr ',' ".." expr]` form, the expression after the `".."`
-must be a constant expression that can be evaluated at compile time, such
-as a [literal](#literals) or a [static item](#static-items).
-
 ~~~~
 [1, 2, 3, 4];
 ["a", "b", "c", "d"];
@@ -2008,8 +2004,8 @@ then the expression completes.
 Some examples of call expressions:
 
 ~~~~
-# use core::from_str::FromStr::from_str;
 # fn add(x: int, y: int) -> int { 0 }
+# use core::from_str::FromStr::from_str;
 
 let x: int = add(1, 2);
 let pi = from_str::<f32>("3.14");
@@ -2160,19 +2156,6 @@ do f |j| {
 }
 ~~~~
 
-In this example, both calls to the (binary) function `k` are equivalent:
-
-~~~~
-# fn k(x:int, f: &fn(int)) { }
-# fn l(i: int) { }
-
-k(3, |j| l(j));
-
-do k(3) |j| {
-   l(j);
-}
-~~~~
-
 
 ### For expressions
 
@@ -2201,7 +2184,7 @@ and early boolean-valued returns from the `block` function,
 such that the meaning of `break` and `loop` is preserved in a primitive loop
 when rewritten as a `for` loop controlled by a higher order function.
 
-An example of a for loop over the contents of a vector:
+An example a for loop:
 
 ~~~~
 # type foo = int;
@@ -2215,14 +2198,6 @@ for v.each |e| {
 }
 ~~~~
 
-An example of a for loop over a series of integers:
-
-~~~~
-# fn bar(b:uint) { }
-for uint::range(0, 256) |i| {
-    bar(i);
-}
-~~~~
 
 ### If expressions
 
@@ -2499,7 +2474,6 @@ fail_unless!(b != "world");
 
 The vector type constructor represents a homogeneous array of values of a given type.
 A vector has a fixed size.
-(Operations like `vec::push` operate solely on owned vectors.)
 A vector type can be annotated with a _definite_ size,
 written with a trailing asterisk and integer literal, such as `[int * 10]`.
 Such a definite-sized vector type is a first-class type, since its size is known statically.
@@ -2510,10 +2484,6 @@ such as `&[T]`, `@[T]` or `~[T]`.
 The kind of a vector type depends on the kind of its element type,
 as with other simple structural types.
 
-Expressions producing vectors of definite size cannot be evaluated in a
-context expecting a vector of indefinite size; one must copy the
-definite-sized vector contents into a distinct vector of indefinite size.
-
 An example of a vector type and its use:
 
 ~~~~

branches/try2/doc/tutorial-borrowed-ptr.md

@@ -485,7 +485,7 @@ For example, we could write a subroutine like this:
 
 ~~~
 struct Point {x: float, y: float}
-fn get_x<'r>(p: &'r Point) -> &'r float { &p.x }
+fn get_x(p: &'r Point) -> &'r float { &p.x }
 ~~~
 
 Here, the function `get_x()` returns a pointer into the structure it
@@ -571,8 +571,8 @@ function:
 #     Rectangle(Point, Size)  // upper-left, dimensions
 # }
 # fn compute_area(shape: &Shape) -> float { 0f }
-fn select<'r, T>(shape: &'r Shape, threshold: float,
-                 a: &'r T, b: &'r T) -> &'r T {
+fn select<T>(shape: &'r Shape, threshold: float,
+             a: &'r T, b: &'r T) -> &'r T {
     if compute_area(shape) > threshold {a} else {b}
 }
 ~~~
@@ -591,12 +591,12 @@ example:
 #     Rectangle(Point, Size)  // upper-left, dimensions
 # }
 # fn compute_area(shape: &Shape) -> float { 0f }
-# fn select<'r, T>(shape: &Shape, threshold: float,
-#                  a: &'r T, b: &'r T) -> &'r T {
+# fn select<T>(shape: &Shape, threshold: float,
+#              a: &'r T, b: &'r T) -> &'r T {
 #     if compute_area(shape) > threshold {a} else {b}
 # }
                                                      // -+ r
-fn select_based_on_unit_circle<'r, T>(               //  |-+ B
+fn select_based_on_unit_circle<T>(                   //  |-+ B
     threshold: float, a: &'r T, b: &'r T) -> &'r T { //  | |
                                                      //  | |
     let shape = Circle(Point {x: 0., y: 0.}, 1.);    //  | |
@@ -628,8 +628,8 @@ returned. Here is how the new `select()` might look:
 #     Rectangle(Point, Size)  // upper-left, dimensions
 # }
 # fn compute_area(shape: &Shape) -> float { 0f }
-fn select<'r, 'tmp, T>(shape: &'tmp Shape, threshold: float,
-                       a: &'r T, b: &'r T) -> &'r T {
+fn select<T>(shape: &'tmp Shape, threshold: float,
+             a: &'r T, b: &'r T) -> &'r T {
     if compute_area(shape) > threshold {a} else {b}
 }
 ~~~
@@ -647,8 +647,8 @@ concise to just omit the named lifetime for `shape` altogether:
 #     Rectangle(Point, Size)  // upper-left, dimensions
 # }
 # fn compute_area(shape: &Shape) -> float { 0f }
-fn select<'r, T>(shape: &Shape, threshold: float,
-                 a: &'r T, b: &'r T) -> &'r T {
+fn select<T>(shape: &Shape, threshold: float,
+             a: &'r T, b: &'r T) -> &'r T {
     if compute_area(shape) > threshold {a} else {b}
 }
 ~~~