From 37b8ce006475bba311d275d631cd3494937355fc Mon Sep 17 00:00:00 2001 From: Piotr Jawniak Date: Sun, 22 Jun 2014 15:55:27 +0200 Subject: [PATCH] Remove duplicated test files Even if they used to test different things in the past, they are now identical to other files. Closes #11496 --- src/test/compile-fail/issue-2123.rs | 15 --------------- src/test/compile-fail/issue-3993-3.rs | 20 -------------------- src/test/compile-fail/type-mismatch.rs | 18 ------------------ src/test/run-fail/binop-fail-2.rs | 13 ------------- src/test/run-pass/deriving-meta-multiple.rs | 5 ++++- src/test/run-pass/unique-decl-move-temp.rs | 14 -------------- 6 files changed, 4 insertions(+), 81 deletions(-) delete mode 100644 src/test/compile-fail/issue-2123.rs delete mode 100644 src/test/compile-fail/issue-3993-3.rs delete mode 100644 src/test/compile-fail/type-mismatch.rs delete mode 100644 src/test/run-fail/binop-fail-2.rs delete mode 100644 src/test/run-pass/unique-decl-move-temp.rs diff --git a/src/test/compile-fail/issue-2123.rs b/src/test/compile-fail/issue-2123.rs deleted file mode 100644 index 335012cedb8..00000000000 --- a/src/test/compile-fail/issue-2123.rs +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright 2012-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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -use x = m::f; //~ ERROR unresolved import `m::f`. There is no `f` in `m` - -mod m {} - -fn main() {} diff --git a/src/test/compile-fail/issue-3993-3.rs b/src/test/compile-fail/issue-3993-3.rs deleted file mode 100644 index fae5eb51272..00000000000 --- a/src/test/compile-fail/issue-3993-3.rs +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2012 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -use zoo::fly; //~ ERROR: function `fly` is private - -mod zoo { - fn fly() {} -} - - -fn main() { - fly(); -} diff --git a/src/test/compile-fail/type-mismatch.rs b/src/test/compile-fail/type-mismatch.rs deleted file mode 100644 index c5e378132ab..00000000000 --- a/src/test/compile-fail/type-mismatch.rs +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright 2012 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -// issue #516 - -fn main() { - let x = true; - let y = 1; - let z = x + y; - //~^ ERROR binary operation `+` cannot be applied to type `bool` -} diff --git a/src/test/run-fail/binop-fail-2.rs b/src/test/run-fail/binop-fail-2.rs deleted file mode 100644 index 1ae520bbf1a..00000000000 --- a/src/test/run-fail/binop-fail-2.rs +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright 2012 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -// error-pattern:quux -fn my_err(s: String) -> ! { println!("{}", s); fail!("quux"); } -fn main() { 3u == my_err("bye".to_string()); } diff --git a/src/test/run-pass/deriving-meta-multiple.rs b/src/test/run-pass/deriving-meta-multiple.rs index 61df7bf5088..27e0b998882 100644 --- a/src/test/run-pass/deriving-meta-multiple.rs +++ b/src/test/run-pass/deriving-meta-multiple.rs @@ -11,7 +11,10 @@ use std::hash::hash; -#[deriving(PartialEq, Clone, Hash)] +// testing mulptiple separate deriving attributes +#[deriving(PartialEq)] +#[deriving(Clone)] +#[deriving(Hash)] struct Foo { bar: uint, baz: int diff --git a/src/test/run-pass/unique-decl-move-temp.rs b/src/test/run-pass/unique-decl-move-temp.rs deleted file mode 100644 index 346b7d0bfcc..00000000000 --- a/src/test/run-pass/unique-decl-move-temp.rs +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright 2012 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -pub fn main() { - let i = box 100; - assert_eq!(*i, 100); -}