Skip to content

Commit a8bb2e5

Browse files
committed
---
yaml --- r: 208079 b: refs/heads/snap-stage3 c: 4b8098b h: refs/heads/master i: 208077: 8da96fb 208075: 5bb7aad 208071: b425525 208063: cd4f940 v: v3
1 parent b84d93b commit a8bb2e5

14 files changed

+31
-27
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: 38a97becdf3e6a6157f6f7ec2d98ade8d8edc193
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 414dfb13df96a373c7fd37f6beb299e176675e0e
4+
refs/heads/snap-stage3: 4b8098bb193d82d18183a8223507f5908adeeb4c
55
refs/heads/try: 7b4ef47b7805a402d756fb8157101f64880a522f
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/src/test/compile-fail/issue-12187-1.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2014-2015 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -14,5 +14,5 @@ fn new<T>() -> &'static T {
1414

1515
fn main() {
1616
let &v = new();
17-
//~^ ERROR type annotations required
17+
//~^ ERROR type annotations or generic parameter binding required
1818
}

branches/snap-stage3/src/test/compile-fail/issue-12187-2.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2014-2015 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -14,5 +14,5 @@ fn new<'r, T>() -> &'r T {
1414

1515
fn main() {
1616
let &v = new();
17-
//~^ ERROR type annotations required
17+
//~^ ERROR type annotations or generic parameter binding required
1818
}

branches/snap-stage3/src/test/compile-fail/issue-5062.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2013-2015 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -9,4 +9,4 @@
99
// except according to those terms.
1010

1111
fn main() { format!("{:?}", None); }
12-
//~^ ERROR type annotations required
12+
//~^ ERROR type annotations or generic parameter binding required

branches/snap-stage3/src/test/compile-fail/issue-6458-2.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2013-2015 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -11,5 +11,5 @@
1111
fn main() {
1212
// Unconstrained type:
1313
format!("{:?}", None);
14-
//~^ ERROR type annotations required
14+
//~^ ERROR type annotations or generic parameter binding required
1515
}

branches/snap-stage3/src/test/compile-fail/issue-6458-3.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2013-2015 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -12,5 +12,5 @@ use std::mem;
1212

1313
fn main() {
1414
mem::transmute(0);
15-
//~^ ERROR type annotations required
15+
//~^ ERROR type annotations or generic parameter binding required
1616
}

branches/snap-stage3/src/test/compile-fail/issue-6458-4.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2013-2015 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -10,7 +10,7 @@
1010

1111
fn foo(b: bool) -> Result<bool,String> {
1212
Err("bar".to_string());
13-
//~^ ERROR type annotations required
13+
//~^ ERROR type annotations or generic parameter binding required
1414
}
1515

1616
fn main() {

branches/snap-stage3/src/test/compile-fail/issue-6458.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2013-2015 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -16,7 +16,8 @@ pub struct MyState;
1616
pub fn foo<State>(_: TypeWithState<State>) {}
1717

1818
pub fn bar() {
19-
foo(TypeWithState(marker::PhantomData)); //~ ERROR type annotations required
19+
foo(TypeWithState(marker::PhantomData));
20+
//~^ ERROR type annotations or generic parameter binding required
2021
}
2122

2223
fn main() {

branches/snap-stage3/src/test/compile-fail/issue-7813.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2014-2015 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -10,5 +10,5 @@
1010

1111
fn main() {
1212
let v = &[];
13-
let it = v.iter(); //~ ERROR type annotations required
13+
let it = v.iter(); //~ ERROR type annotations or generic parameter binding required
1414
}

branches/snap-stage3/src/test/compile-fail/method-ambig-one-trait-unknown-int-type.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -31,7 +31,8 @@ impl foo for Vec<isize> {
3131

3232
fn m1() {
3333
// we couldn't infer the type of the vector just based on calling foo()...
34-
let mut x = Vec::new(); //~ ERROR type annotations required
34+
let mut x = Vec::new();
35+
//~^ ERROR type annotations or generic parameter binding required
3536
x.foo();
3637
}
3738

branches/snap-stage3/src/test/compile-fail/traits-multidispatch-convert-ambig-dest.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2014-2015 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -33,7 +33,8 @@ where T : Convert<U>
3333
}
3434

3535
fn a() {
36-
test(22, std::default::Default::default()); //~ ERROR type annotations required
36+
test(22, std::default::Default::default());
37+
//~^ ERROR type annotations or generic parameter binding required
3738
}
3839

3940
fn main() {}

branches/snap-stage3/src/test/compile-fail/unconstrained-none.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2013-2015 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -11,5 +11,5 @@
1111
// Issue #5062
1212

1313
fn main() {
14-
None; //~ ERROR type annotations required
14+
None; //~ ERROR type annotations or generic parameter binding required
1515
}

branches/snap-stage3/src/test/compile-fail/unconstrained-ref.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -13,5 +13,5 @@ struct S<'a, T:'a> {
1313
}
1414

1515
fn main() {
16-
S { o: &None }; //~ ERROR type annotations required
16+
S { o: &None }; //~ ERROR type annotations or generic parameter binding required
1717
}

branches/snap-stage3/src/test/compile-fail/vector-no-ann.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -10,5 +10,6 @@
1010

1111

1212
fn main() {
13-
let _foo = Vec::new(); //~ ERROR type annotations required
13+
let _foo = Vec::new();
14+
//~^ ERROR type annotations or generic parameter binding required
1415
}

0 commit comments

Comments
 (0)