---

yaml
---
r: 34283
b: refs/heads/snap-stage3
c: 84671e5
h: refs/heads/master
i:
  34281: a53cee4
  34279: 45a05ca
v: v3

Author: catamorphism

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 915246314b92c06fa7b0923c25849278b76f4daa
+refs/heads/snap-stage3: 84671e5d753a4e81939416afef18c03cb6369069
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/AUTHORS.txt

@@ -44,6 +44,7 @@ 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]>
@@ -89,6 +90,7 @@ 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/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(args: ~[~str]) {
-    io::println(sha1(args[1]));
+fn main() {
+    io::println(sha1(core::os::args()[1]));
 }
 ~~~~
 

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",
-                  ~"--verify",
+                  ~"--verbose",
                  sig.to_str(), data.to_str()]);
     if res.status != 0 {
         return false;

branches/snap-stage3/src/test/run-pass/issue-3250.rs

@@ -0,0 +1,7 @@
+#[auto_serialize]
+
+type t = (uint, uint);
+
+ 
+
+fn main() { }

branches/snap-stage3/src/test/run-pass/trait-composition-trivial.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-fast - ICE
 trait Foo {
     fn foo();
 }