---

catamorphism · catamorphism · commit 2a626e2110b6 · 2012-12-23T13:37:36.000-08:00
yaml --- r: 39559 b: refs/heads/incoming c: 9152463 h: refs/heads/master i: 39557: c51f5eb 39555: 33400bb 39551: e179219 v: v3
diff --git a/[refs] b/[refs]
@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: 688c5b920a2af3a4de2dc9fe4cfeb65c23e5d509
+refs/heads/incoming: 915246314b92c06fa7b0923c25849278b76f4daa
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/incoming/AUTHORS.txt b/branches/incoming/AUTHORS.txt
@@ -44,7 +44,6 @@ Drew Willcoxon <adw@mozilla.com>
 Elliott Slaughter <elliottslaughter@gmail.com>
 Elly Fong-Jones <elly@leptoquark.net>
 Eric Holk <eric.holk@gmail.com>
-Eric Holmes <eric@ejholmes.net>
 Erick Tryzelaar <erick.tryzelaar@gmail.com>
 Erik Rose <erik@mozilla.com>
 Evan McClanahan <evan@evanmcc.com>
diff --git a/branches/incoming/doc/tutorial-ffi.md b/branches/incoming/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]));
 }
 ~~~~
 
diff --git a/branches/incoming/src/libcargo/pgp.rs b/branches/incoming/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;
diff --git a/branches/incoming/src/test/run-pass/issue-3250.rs b/branches/incoming/src/test/run-pass/issue-3250.rs
diff --git a/branches/incoming/src/test/run-pass/trait-composition-trivial.rs b/branches/incoming/src/test/run-pass/trait-composition-trivial.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// xfail-fast - ICE
 trait Foo {
     fn foo();
 }

-Original file line number
+Diff line change
 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]>
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ extern mod crypto {`
`22`	`22`
`23`	`23`	`fn as_hex(data: ~[u8]) -> ~str {`
`24`	`24`	`let mut acc = ~"";`
`25`		`- for data.each \|&byte\| { acc += fmt!("%02x", byte as uint); }`
	`25`	`+ for data.each \|byte\| { acc += fmt!("%02x", byte as uint); }`
`26`	`26`	`return acc;`
`27`	`27`	`}`
`28`	`28`
`@@ -33,8 +33,8 @@ fn sha1(data: ~str) -> ~str unsafe {`
`33`	`33`	`return as_hex(vec::from_buf(hash, 20));`
`34`	`34`	`}`
`35`	`35`
`36`		`-fn main() {`
`37`		`- io::println(sha1(core::os::args()[1]));`
	`36`	`+fn main(args: ~[~str]) {`
	`37`	`+ io::println(sha1(args[1]));`
`38`	`38`	`}`
`39`	`39`	`~~~~`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`// option. This file may not be copied, modified, or distributed`
`9`	`9`	`// except according to those terms.`
`10`	`10`
	`11`	`+// xfail-fast - ICE`
`11`	`12`	`trait Foo {`
`12`	`13`	`fn foo();`
`13`	`14`	`}`