Skip to content

Commit 6f9971e

Browse files
committed
---
yaml --- r: 38173 b: refs/heads/try c: 889e560 h: refs/heads/master i: 38171: 32292e3 v: v3
1 parent 41f90bc commit 6f9971e

File tree

5 files changed

+7
-13
lines changed

5 files changed

+7
-13
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 09bb07bed9166105ea961a42b5fff7739ae0d2e9
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
5-
refs/heads/try: 4752081dc5550881008aba330a8d982cf9e11270
5+
refs/heads/try: 889e560ca5d532ab577d1f50238795cd9a871998
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/doc/tutorial-ffi.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ extern mod crypto {
2222
2323
fn as_hex(data: ~[u8]) -> ~str {
2424
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); }
2626
return acc;
2727
}
2828
@@ -33,8 +33,8 @@ fn sha1(data: ~str) -> ~str unsafe {
3333
return as_hex(vec::from_buf(hash, 20));
3434
}
3535
36-
fn main() {
37-
io::println(sha1(core::os::args()[1]));
36+
fn main(args: ~[~str]) {
37+
io::println(sha1(args[1]));
3838
}
3939
~~~~
4040

branches/try/doc/tutorial.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2419,10 +2419,10 @@ these two files:
24192419
pub fn explore() -> &str { "world" }
24202420
~~~~
24212421

2422-
~~~~ {.xfail-test}
2422+
~~~~
24232423
// main.rs
24242424
extern mod world;
2425-
fn main() { io::println("hello " + world::explore()); }
2425+
fn main() { io::println(~"hello " + world::explore()); }
24262426
~~~~
24272427

24282428
Now compile and run like this (adjust to your platform if necessary):

branches/try/src/test/run-pass/issue-3250.rs

Lines changed: 0 additions & 7 deletions
This file was deleted.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// xfail-fast - ICE
1112
trait Foo {
1213
fn foo();
1314
}

0 commit comments

Comments
 (0)