Skip to content

Commit 42b3500

Browse files
emberianthestinger
authored andcommitted
---
yaml --- r: 63618 b: refs/heads/snap-stage3 c: adb8ac4 h: refs/heads/master v: v3
1 parent f170f47 commit 42b3500

35 files changed

+99
-247
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: e2e39234cc5509fb461b8805eeb32c5ce538ee6e
4+
refs/heads/snap-stage3: adb8ac41620b42c1a27c8c013628e49701fb3b27
55
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/test/run-pass/autoderef-method-priority.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
// xfail-test
2-
// xfail'd because of a problem with by-value self.
3-
1+
// xfail-test #5321
42
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
53
// file at the top-level directory of this distribution and at
64
// http://rust-lang.org/COPYRIGHT.

branches/snap-stage3/src/test/run-pass/class-cast-to-trait-cross-crate.rs

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

branches/snap-stage3/src/test/run-pass/class-impl-parameterized-trait.rs

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

11-
// xfail-test
11+
// xfail-test FIXME #7307
1212
// xfail-fast
1313

1414
extern mod extra;

branches/snap-stage3/src/test/run-pass/class-implements-multiple-traits.rs

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

11-
// xfail-test
11+
// xfail-test FIXME #7305
1212

1313
extern mod extra;
1414
use extra::oldmap::*;

branches/snap-stage3/src/test/run-pass/coerce-reborrow-imm-vec-arg.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
// xfail-test
2-
31
fn sum(x: &[int]) -> int {
42
let mut sum = 0;
5-
for x.each |y| { sum += *y; }
3+
for x.iter().advance |y| { sum += *y; }
64
return sum;
75
}
86

@@ -14,8 +12,10 @@ fn sum_imm(y: &[int]) -> int {
1412
sum(y)
1513
}
1614

15+
/* FIXME #7304
1716
fn sum_const(y: &const [int]) -> int {
1817
sum(y)
1918
}
19+
*/
2020

2121
pub fn main() {}
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
// xfail-test
2-
1+
/* FIXME #7302
32
fn foo(v: &const [uint]) -> ~[uint] {
4-
v.to_vec()
3+
v.to_owned()
54
}
5+
*/
66

77
fn bar(v: &mut [uint]) -> ~[uint] {
8-
v.to_vec()
8+
v.to_owned()
99
}
1010

1111
fn bip(v: &[uint]) -> ~[uint] {
12-
v.to_vec()
12+
v.to_owned()
1313
}
1414

1515
pub fn main() {
16-
let mut the_vec = ~[1, 2, 3, 100];
17-
assert_eq!(the_vec, foo(the_vec));
18-
assert_eq!(the_vec, bar(the_vec));
19-
assert_eq!(the_vec, bip(the_vec));
16+
let mut the_vec = ~[1u, 2, 3, 100];
17+
// assert_eq!(the_vec.clone(), foo(the_vec));
18+
assert_eq!(the_vec.clone(), bar(the_vec));
19+
assert_eq!(the_vec.clone(), bip(the_vec));
2020
}

branches/snap-stage3/src/test/run-pass/deriving-global.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// xfail-test #7103 `extern mod` does not work on windows
1+
// xfail-fast #7103 `extern mod` does not work on windows
22

33
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
44
// file at the top-level directory of this distribution and at

branches/snap-stage3/src/test/run-pass/extern-mod-url.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
// Just a test that new-style extern mods parse
1212

13-
// xfail-test
13+
// xfail-test FIXME #6407
1414
extern mod test = "github.com/catamorphism/test-pkg";
1515

16-
fn main() {}
16+
fn main() {}

branches/snap-stage3/src/test/run-pass/fn-bare-size.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,9 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-test
12-
13-
extern mod extra;
11+
use std::sys;
1412

1513
pub fn main() {
1614
// Bare functions should just be a pointer
17-
assert!(sys::rustrt::size_of::<fn()>() ==
18-
sys::rustrt::size_of::<int>());
15+
assert_eq!(sys::size_of::<extern "Rust" fn()>(), sys::size_of::<int>());
1916
}

branches/snap-stage3/src/test/run-pass/foreign-mod.rc

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

11-
// xfail-test
11+
// xfail-test FIXME #7308
1212
// -*- rust -*-
1313

1414
native mod libc = target_libc {

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-test
11+
// xfail-test FIXME #1866
1212
mod a {
1313
pub type rust_task = uint;
1414
pub mod rustrt {
15+
use super::rust_task;
1516
pub extern {
1617
pub fn rust_task_is_unwinding(rt: *rust_task) -> bool;
1718
}
@@ -21,6 +22,7 @@ mod a {
2122
mod b {
2223
pub type rust_task = bool;
2324
pub mod rustrt {
25+
use super::rust_task;
2426
pub extern {
2527
pub fn rust_task_is_unwinding(rt: *rust_task) -> bool;
2628
}

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

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

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

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

11-
// xfail-test
11+
// xfail-test FIXME #2190
1212
mod a {
13-
fn foo(f: &fn()) { f() }
14-
fn bar() {}
15-
pub fn main() { foo(||bar()); }
13+
fn foo(f: &fn()) { f() }
14+
fn bar() {}
15+
pub fn main() { foo(||bar()); }
1616
}
1717

1818
mod b {
19-
fn foo(f: Option<&fn()>) { f.iter(|x|x()) }
20-
fn bar() {}
21-
pub fn main() { foo(Some(bar)); }
19+
fn foo(f: Option<&fn()>) { f.iter(|x|x()) }
20+
fn bar() {}
21+
pub fn main() { foo(Some(bar)); }
2222
}
2323

2424
mod c {
25-
fn foo(f: Option<&fn()>) { f.iter(|x|x()) }
26-
fn bar() {}
27-
pub fn main() { foo(Some(||bar())); }
25+
fn foo(f: Option<&fn()>) { f.iter(|x|x()) }
26+
fn bar() {}
27+
pub fn main() { foo(Some(||bar())); }
2828
}
2929

3030
pub fn main() {

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

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

11-
// xfail-test
11+
// xfail-test FIXME #3290
1212
fn main() {
1313
let mut x = ~3;
1414
x = x;

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

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

11-
// xfail-test
11+
// xfail-test FIXME #3796
1212
#[deny(dead_assignment)];
1313
fn main() {
1414
let mut x = 1;

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

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

11-
// xfail-test
11+
// xfail-test FIXME #3874
1212
enum PureCounter { PureCounter(uint) }
1313

1414
fn each(self: PureCounter, blk: &fn(v: &uint)) {

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,17 @@
99
// except according to those terms.
1010

1111
// xfail-test
12+
1213
trait A {
13-
fn a_method();
14+
fn a_method(&self);
1415
}
1516

1617
trait B: A {
17-
fn b_method();
18+
fn b_method(&self);
1819
}
1920

2021
trait C: B {
21-
fn c_method() {
22+
fn c_method(&self) {
2223
self.a_method();
2324
}
2425
}

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

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

11-
// xfail-test
11+
// xfail-test FIXME #5946
1212
trait Positioned<S> {
1313
fn SetX(&mut self, S);
1414
fn X(&self) -> S;

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-test
1211
extern mod extra;
1312

1413
use extra::net::tcp::TcpSocketBuf;
1514

15+
use std::io;
16+
use std::int;
17+
1618
use std::io::{ReaderUtil,WriterUtil};
1719

1820
enum Result {
@@ -97,9 +99,9 @@ priv fn cmd_to_str(cmd: ~[~str]) -> ~str {
9799
let mut res = ~"*";
98100
res.push_str(cmd.len().to_str());
99101
res.push_str("\r\n");
100-
for cmd.each |s| {
102+
for cmd.iter().advance |s| {
101103
res.push_str([~"$", s.len().to_str(), ~"\r\n",
102-
copy *s, ~"\r\n"].concat()));
104+
copy *s, ~"\r\n"].concat() );
103105
}
104106
res
105107
}

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

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

11-
// xfail-test
11+
use std::io;
12+
1213
fn parse_args() -> ~str {
1314
let args = std::os::args();
1415
let mut n = 0;

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-test
11+
use std::os;
12+
1213
pub fn main() {
13-
for os::args().each |arg| {
14+
let x = os::args();
15+
for x.iter().advance |arg| {
1416
match arg.clone() {
1517
s => { }
1618
}

branches/snap-stage3/src/test/run-pass/issue_3882.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// xfail-test
2-
31
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
42
// file at the top-level directory of this distribution and at
53
// http://rust-lang.org/COPYRIGHT.
@@ -10,6 +8,7 @@
108
// option. This file may not be copied, modified, or distributed
119
// except according to those terms.
1210

11+
// xfail-test
1312
// aux-build:issue_3882.rc
1413
extern mod linenoise;
1514
use linenoise::issue_3882::*;

0 commit comments

Comments
 (0)