Skip to content

Commit 1721e81

Browse files
committed
auto merge of #16568 : jakub-/rust/needstest, r=pcwalton
Closes #8761. Closes #16010. Closes #13033. Closes #15094.
2 parents ed7a3d6 + 5b9cd45 commit 1721e81

File tree

4 files changed

+90
-0
lines changed

4 files changed

+90
-0
lines changed

src/test/compile-fail/issue-13033.rs

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
trait Foo {
12+
fn bar(&mut self, other: &mut Foo);
13+
}
14+
15+
struct Baz;
16+
17+
impl Foo for Baz {
18+
fn bar(&mut self, other: &Foo) {}
19+
//~^ ERROR method `bar` has an incompatible type for trait: values differ in mutability [E0053]
20+
}
21+
22+
fn main() {}

src/test/compile-fail/issue-15094.rs

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
#![feature(overloaded_calls)]
12+
13+
use std::{fmt, ops};
14+
15+
struct Shower<T> {
16+
x: T
17+
}
18+
19+
impl<T: fmt::Show> ops::Fn<(), ()> for Shower<T> {
20+
fn call(&self, _args: ()) {
21+
//~^ ERROR `call` has an incompatible type for trait: expected "rust-call" fn but found "Rust" fn
22+
println!("{}", self.x);
23+
}
24+
}
25+
26+
fn make_shower<T>(x: T) -> Shower<T> {
27+
Shower { x: x }
28+
}
29+
30+
pub fn main() {
31+
let show3 = make_shower(3i);
32+
show3();
33+
}

src/test/compile-fail/issue-8761.rs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
enum Foo {
12+
A = 1i64,
13+
//~^ ERROR mismatched types: expected `int` but found `i64`
14+
B = 2u8
15+
//~^ ERROR mismatched types: expected `int` but found `u8`
16+
}
17+
18+
fn main() {}

src/test/run-pass/issue-16452.rs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
fn main() {
12+
if true { return }
13+
match () {
14+
() => { static MAGIC: uint = 0; }
15+
}
16+
}
17+

0 commit comments

Comments
 (0)