Skip to content

Commit

Permalink
Add missing tests for fixed issues
Browse files Browse the repository at this point in the history
Closes #8761.
Closes #16010.
Closes #13033.
Closes #15094.
  • Loading branch information
Jakub Wieczorek committed Aug 17, 2014
1 parent a12a4dd commit 5b9cd45
Show file tree
Hide file tree
Showing 4 changed files with 90 additions and 0 deletions.
22 changes: 22 additions & 0 deletions src/test/compile-fail/issue-13033.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

trait Foo {
fn bar(&mut self, other: &mut Foo);
}

struct Baz;

impl Foo for Baz {
fn bar(&mut self, other: &Foo) {}
//~^ ERROR method `bar` has an incompatible type for trait: values differ in mutability [E0053]
}

fn main() {}
33 changes: 33 additions & 0 deletions src/test/compile-fail/issue-15094.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(overloaded_calls)]

use std::{fmt, ops};

struct Shower<T> {
x: T
}

impl<T: fmt::Show> ops::Fn<(), ()> for Shower<T> {
fn call(&self, _args: ()) {
//~^ ERROR `call` has an incompatible type for trait: expected "rust-call" fn but found "Rust" fn
println!("{}", self.x);
}
}

fn make_shower<T>(x: T) -> Shower<T> {
Shower { x: x }
}

pub fn main() {
let show3 = make_shower(3i);
show3();
}
18 changes: 18 additions & 0 deletions src/test/compile-fail/issue-8761.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

enum Foo {
A = 1i64,
//~^ ERROR mismatched types: expected `int` but found `i64`
B = 2u8
//~^ ERROR mismatched types: expected `int` but found `u8`
}

fn main() {}
17 changes: 17 additions & 0 deletions src/test/run-pass/issue-16452.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

fn main() {
if true { return }
match () {
() => { static MAGIC: uint = 0; }
}
}

5 comments on commit 5b9cd45

@bors
Copy link
Contributor

@bors bors commented on 5b9cd45 Aug 18, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 5b9cd45 Aug 18, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging jakub-/rust/needstest = 5b9cd45 into auto

@bors
Copy link
Contributor

@bors bors commented on 5b9cd45 Aug 18, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jakub-/rust/needstest = 5b9cd45 merged ok, testing candidate = 1721e81

@bors
Copy link
Contributor

@bors bors commented on 5b9cd45 Aug 18, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 1721e81

Please sign in to comment.