---

yaml
---
r: 34302
b: refs/heads/snap-stage3
c: 50902bb
h: refs/heads/master
v: v3

Author: erickt

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 3cc0fbca5d0a37f9b770db27e3ea39a00616ca4f
+refs/heads/snap-stage3: 50902bb3025ed9e583bf029c78406cb5b9abf7c7
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/AUTHORS.txt

@@ -44,7 +44,6 @@ Drew Willcoxon <[email protected]>
 Elliott Slaughter <[email protected]>
 Elly Fong-Jones <[email protected]>
 Eric Holk <[email protected]>
-Eric Holmes <[email protected]>
 Erick Tryzelaar <[email protected]>
 Erik Rose <[email protected]>
 Evan McClanahan <[email protected]>
@@ -69,7 +68,6 @@ Jeff Balogh <[email protected]>
 Jeff Muizelaar <[email protected]>
 Jeff Olson <[email protected]>
 Jeffrey Yasskin <[email protected]>
-Jens Nockert <[email protected]>
 Jesse Ruderman <[email protected]>
 Jim Blandy <[email protected]>
 Jimmy Lu <[email protected]>
@@ -91,7 +89,6 @@ Magnus Auvinen <[email protected]>
 Mahmut Bulut <[email protected]>
 Margaret Meyerhofer <[email protected]>
 Marijn Haverbeke <[email protected]>
-Martin DeMello <[email protected]>
 Matt Brubeck <[email protected]>
 Matthew O'Connor <[email protected]>
 Max Penet <[email protected]>

branches/snap-stage3/Makefile.in

@@ -154,7 +154,7 @@ LIBRUSTI_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,rusti)
 
 # version-string calculation
 CFG_GIT_DIR := $(CFG_SRC_DIR).git
-CFG_RELEASE = 0.6
+CFG_RELEASE = 0.5
 CFG_VERSION = $(CFG_RELEASE)
 
 ifneq ($(wildcard $(CFG_GIT)),)

branches/snap-stage3/README.md

@@ -42,7 +42,7 @@ packages:
 Assuming you're on a relatively modern *nix system and have met the
 prerequisites, something along these lines should work.
 
-    $ wget http://static.rust-lang.org/dist/rust-0.5.tar.gz
+    $ wget http://dl.rust-lang.org/dist/rust-0.5.tar.gz
     $ tar -xzf rust-0.5.tar.gz
     $ cd rust-0.5
     $ ./configure
@@ -59,8 +59,8 @@ When complete, `make install` will place several programs into
 API-documentation tool, and `cargo`, the Rust package manager.
 
 [wiki-start]: https://github.com/mozilla/rust/wiki/Note-getting-started-developing-Rust
-[tarball]: http://static.rust-lang.org/dist/rust-0.5.tar.gz
-[win-exe]: http://static.rust-lang.org/dist/rust-0.5-install.exe
+[tarball]: http://dl.rust-lang.org/dist/rust-0.5.tar.gz
+[win-exe]: http://dl.rust-lang.org/dist/rust-0.5-install.exe
 
 
 ## License
@@ -74,4 +74,4 @@ See LICENSE.txt for details.
 
 The [tutorial] is a good starting point.
 
-[tutorial]: http://static.rust-lang.org/doc/tutorial.html
+[tutorial]: http://dl.rust-lang.org/doc/tutorial.html

branches/snap-stage3/doc/rust.md

@@ -1107,19 +1107,6 @@ let mut a: Animal = Dog;
 a = Cat;
 ~~~~
 
-Enumeration constructors can have either named or unnamed fields:
-~~~~
-enum Animal {
-    Dog (~str, float),
-    Cat { name: ~str, weight: float }
-}
-
-let mut a: Animal = Dog(~"Cocoa", 37.2);
-a = Cat{ name: ~"Spotty", weight: 2.7 };
-~~~~
-
-In this example, `Cat` is a _struct-like enum variant_,
-whereas `Dog` is simply called an enum variant.
 ### Constants
 
 ~~~~~~~~ {.ebnf .gram}

branches/snap-stage3/doc/tutorial-ffi.md

@@ -22,7 +22,7 @@ extern mod crypto {
 
 fn as_hex(data: ~[u8]) -> ~str {
     let mut acc = ~"";
-    for data.each |&byte| { acc += fmt!("%02x", byte as uint); }
+    for data.each |byte| { acc += fmt!("%02x", byte as uint); }
     return acc;
 }
 
@@ -33,8 +33,8 @@ fn sha1(data: ~str) -> ~str unsafe {
     return as_hex(vec::from_buf(hash, 20));
 }
 
-fn main() {
-    io::println(sha1(core::os::args()[1]));
+fn main(args: ~[~str]) {
+    io::println(sha1(args[1]));
 }
 ~~~~
 

branches/snap-stage3/doc/tutorial.md

@@ -99,7 +99,7 @@ If you've fulfilled those prerequisites, something along these lines
 should work.
 
 ~~~~ {.notrust}
-$ curl -O http://static.rust-lang.org/dist/rust-0.5.tar.gz
+$ curl -O http://dl.rust-lang.org/dist/rust-0.5.tar.gz
 $ tar -xzf rust-0.5.tar.gz
 $ cd rust-0.5
 $ ./configure
@@ -118,8 +118,8 @@ API-documentation tool, `cargo`, the Rust package manager,
 and `rusti`, the Rust REPL.
 
 [wiki-start]: https://github.com/mozilla/rust/wiki/Note-getting-started-developing-Rust
-[tarball]: http://static.rust-lang.org/dist/rust-0.5.tar.gz
-[win-exe]: http://static.rust-lang.org/dist/rust-0.5-install.exe
+[tarball]: http://dl.rust-lang.org/dist/rust-0.5.tar.gz
+[win-exe]: http://dl.rust-lang.org/dist/rust-0.5-install.exe
 
 ## Compiling your first program
 
@@ -733,24 +733,6 @@ fn point_from_direction(dir: Direction) -> Point {
 }
 ~~~~
 
-A special kind of enum variant, called _struct-like enums_,
-can have its fields extracted with dot notation and not just destructuring.
-For example:
-
-~~~~
-# struct Point {x: float, y: float}
-# fn square(x: float) -> float { x * x }
-enum Shape {
-    Circle { center: Point, radius: float },
-    Rectangle { left: Point, right: Point }
-}
-fn area(sh: Shape) -> float {
-   match sh {
-      Circle(c) => float::consts::pi * square(c.radius),
-      Rectangle(r) => r.right.x - r.left.x * r.right.y - r.right.y
-   }
-}
-~~~~
 ## Tuples
 
 Tuples in Rust behave exactly like structs, except that their fields
@@ -2440,7 +2422,7 @@ pub fn explore() -> &str { "world" }
 ~~~~ {.xfail-test}
 // main.rs
 extern mod world;
-fn main() { io::println(~"hello " + world::explore()); }
+fn main() { io::println("hello " + world::explore()); }
 ~~~~
 
 Now compile and run like this (adjust to your platform if necessary):

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

@@ -18,8 +18,8 @@
 #[allow(deprecated_mode)];
 #[allow(deprecated_pattern)];
 
-extern mod core(vers = "0.6");
-extern mod std(vers = "0.6");
+extern mod core(vers = "0.5");
+extern mod std(vers = "0.5");
 
 use core::*;
 

branches/snap-stage3/src/driver/driver.rs

@@ -9,21 +9,21 @@
 // except according to those terms.
 
 #[no_core];
-extern mod core(vers = "0.6");
+extern mod core(vers = "0.5");
 
 #[cfg(cargo)]
-extern mod self(name = "cargo", vers = "0.6");
+extern mod self(name = "cargo", vers = "0.5");
 
 #[cfg(fuzzer)]
-extern mod self(name = "fuzzer", vers = "0.6");
+extern mod self(name = "fuzzer", vers = "0.5");
 
 #[cfg(rustdoc)]
-extern mod self(name = "rustdoc", vers = "0.6");
+extern mod self(name = "rustdoc", vers = "0.5");
 
 #[cfg(rusti)]
-extern mod self(name = "rusti", vers = "0.6");
+extern mod self(name = "rusti", vers = "0.5");
 
 #[cfg(rustc)]
-extern mod self(name = "rustc", vers = "0.6");
+extern mod self(name = "rustc", vers = "0.5");
 
 fn main() { self::main() }

branches/snap-stage3/src/etc/vim/after/syntax/rust.vim

@@ -7,6 +7,10 @@ if exists('g:rust_conceal_mod_path')
 	syn match rustNiceOperator "::" conceal cchar=ㆍ
 endif
 
+syn match rustLeftArrowHead contained "-" conceal cchar= 
+syn match rustLeftArrowTail contained "<" conceal cchar=⟵
+syn match rustNiceOperator "<-" contains=rustLeftArrowHead,rustLeftArrowTail
+
 syn match rustRightArrowHead contained ">" conceal cchar= 
 syn match rustRightArrowTail contained "-" conceal cchar=⟶
 syn match rustNiceOperator "->" contains=rustRightArrowHead,rustRightArrowTail

branches/snap-stage3/src/libcargo/cargo.rc

@@ -20,7 +20,7 @@
 // End:
 
 #[link(name = "cargo",
-       vers = "0.6",
+       vers = "0.5",
        uuid = "9ff87a04-8fed-4295-9ff8-f99bb802650b",
        url = "https://github.com/mozilla/rust/tree/master/src/cargo")];
 
@@ -37,10 +37,10 @@
 #[allow(deprecated_mode)];
 #[allow(deprecated_pattern)];
 
-extern mod core(vers = "0.6");
-extern mod std(vers = "0.6");
-extern mod rustc(vers = "0.6");
-extern mod syntax(vers = "0.6");
+extern mod core(vers = "0.5");
+extern mod std(vers = "0.5");
+extern mod rustc(vers = "0.5");
+extern mod syntax(vers = "0.5");
 
 #[legacy_exports]
 mod pgp;

branches/snap-stage3/src/libcargo/pgp.rs

@@ -102,7 +102,7 @@ fn verify(root: &Path, data: &Path, sig: &Path) -> bool {
     let path = root.push("gpg");
     let res = gpgv(~[~"--homedir", path.to_str(),
                   ~"--keyring", ~"pubring.gpg",
-                  ~"--verbose",
+                  ~"--verify",
                  sig.to_str(), data.to_str()]);
     if res.status != 0 {
         return false;

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

@@ -36,7 +36,7 @@ Implicitly, all crates behave as if they included the following prologue:
 
 
 #[link(name = "core",
-       vers = "0.6",
+       vers = "0.5",
        uuid = "c70c24a7-5551-4f73-8e37-380b11d80be8",
        url = "https://github.com/mozilla/rust/tree/master/src/libcore")];
 
@@ -103,7 +103,7 @@ pub mod owned;
 #[cfg(notest)] pub mod cmp;
 
 // Make core testable by not duplicating lang items. See #2912
-#[cfg(test)] extern mod realcore(name = "core", vers = "0.6");
+#[cfg(test)] extern mod realcore(name = "core", vers = "0.5");
 #[cfg(test)] pub use kinds = realcore::kinds;
 #[cfg(test)] pub use ops = realcore::ops;
 #[cfg(test)] pub use cmp = realcore::cmp;
@@ -249,7 +249,7 @@ mod core {
 // Similar to above. Some magic to make core testable.
 #[cfg(test)]
 mod std {
-    extern mod std(vers = "0.6");
+    extern mod std(vers = "0.5");
     pub use std::std::test;
 }
 

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

@@ -67,17 +67,17 @@ pub pure fn DVec<A>() -> DVec<A> {
 }
 
 /// Creates a new dvec with a single element
-pub pure fn from_elem<A>(e: A) -> DVec<A> {
+pub fn from_elem<A>(e: A) -> DVec<A> {
     DVec {mut data: ~[move e]}
 }
 
 /// Creates a new dvec with the contents of a vector
-pub pure fn from_vec<A>(v: ~[A]) -> DVec<A> {
+pub fn from_vec<A>(v: ~[A]) -> DVec<A> {
     DVec {mut data: move v}
 }
 
 /// Consumes the vector and returns its contents
-pub pure fn unwrap<A>(d: DVec<A>) -> ~[A] {
+pub fn unwrap<A>(d: DVec<A>) -> ~[A] {
     let DVec {data: v} = move d;
     move v
 }

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

@@ -188,7 +188,7 @@ pub pure fn to_str_common(num: float, digits: uint, exact: bool) -> ~str {
  * * num - The float value
  * * digits - The number of significant digits
  */
-pub pure fn to_str_exact(num: float, digits: uint) -> ~str {
+pub fn to_str_exact(num: float, digits: uint) -> ~str {
     to_str_common(num, digits, true)
 }
 
@@ -238,7 +238,7 @@ pub pure fn to_str(num: float, digits: uint) -> ~str {
  * `none` if the string did not represent a valid number.  Otherwise,
  * `Some(n)` where `n` is the floating-point number represented by `[num]`.
  */
-pub pure fn from_str(num: &str) -> Option<float> {
+pub fn from_str(num: &str) -> Option<float> {
    if num == "inf" {
        return Some(infinity as float);
    } else if num == "-inf" {

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

@@ -188,11 +188,11 @@ fn SipState(key0: u64, key1: u64) -> SipState {
 }
 
 
-impl SipState : io::Writer {
+impl &SipState : io::Writer {
 
     // Methods for io::writer
     #[inline(always)]
-    fn write(&self, msg: &[const u8]) {
+    fn write(msg: &[const u8]) {
 
         macro_rules! u8to64_le (
             ($buf:expr, $i:expr) =>
@@ -282,16 +282,16 @@ impl SipState : io::Writer {
         self.ntail = left;
     }
 
-    fn seek(&self, _x: int, _s: io::SeekStyle) {
+    fn seek(_x: int, _s: io::SeekStyle) {
         fail;
     }
-    fn tell(&self) -> uint {
+    fn tell() -> uint {
         self.length
     }
-    fn flush(&self) -> int {
+    fn flush() -> int {
         0
     }
-    fn get_type(&self) -> io::WriterType {
+    fn get_type() -> io::WriterType {
         io::File
     }
 }

branches/snap-stage3/src/libcore/int-template/int.rs

@@ -17,12 +17,12 @@ mod inst {
     pub const bits: uint = uint::bits;
 
     /// Returns `base` raised to the power of `exponent`
-    pub pure fn pow(base: int, exponent: uint) -> int {
+    pub fn pow(base: int, exponent: uint) -> int {
         if exponent == 0u {
             //Not mathemtically true if ~[base == 0]
             return 1;
         }
-        if base == 0 { return 0; }
+        if base     == 0  { return 0; }
         let mut my_pow  = exponent;
         let mut acc     = 1;
         let mut multiplier = base;