From 14d476ecbb502d2d085c101b0c41e8e51ca5b4cf Mon Sep 17 00:00:00 2001 From: Carol Nichols Date: Sat, 9 May 2015 13:03:16 -0400 Subject: [PATCH] Remove auxiliary files not used since 812637e --- src/test/auxiliary/crateresolve3-1.rs | 15 -------- src/test/auxiliary/crateresolve3-2.rs | 15 -------- src/test/auxiliary/crateresolve5-1.rs | 34 ------------------- src/test/auxiliary/crateresolve5-2.rs | 33 ------------------ src/test/auxiliary/crateresolve7x.rs | 23 ------------- src/test/auxiliary/crateresolve8-1.rs | 16 --------- src/test/auxiliary/crateresolve_calories-1.rs | 14 -------- src/test/auxiliary/crateresolve_calories-2.rs | 14 -------- 8 files changed, 164 deletions(-) delete mode 100644 src/test/auxiliary/crateresolve3-1.rs delete mode 100644 src/test/auxiliary/crateresolve3-2.rs delete mode 100644 src/test/auxiliary/crateresolve5-1.rs delete mode 100644 src/test/auxiliary/crateresolve5-2.rs delete mode 100644 src/test/auxiliary/crateresolve7x.rs delete mode 100644 src/test/auxiliary/crateresolve8-1.rs delete mode 100644 src/test/auxiliary/crateresolve_calories-1.rs delete mode 100644 src/test/auxiliary/crateresolve_calories-2.rs diff --git a/src/test/auxiliary/crateresolve3-1.rs b/src/test/auxiliary/crateresolve3-1.rs deleted file mode 100644 index 0e02a8d96a3b..000000000000 --- a/src/test/auxiliary/crateresolve3-1.rs +++ /dev/null @@ -1,15 +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. - -#![crate_name="crateresolve3#0.1"] - -#![crate_type = "lib"] - -pub fn f() -> isize { 10 } diff --git a/src/test/auxiliary/crateresolve3-2.rs b/src/test/auxiliary/crateresolve3-2.rs deleted file mode 100644 index 6a11465b27ca..000000000000 --- a/src/test/auxiliary/crateresolve3-2.rs +++ /dev/null @@ -1,15 +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. - -#![crate_name="crateresolve3#0.2"] - -#![crate_type = "lib"] - -pub fn g() -> isize { 20 } diff --git a/src/test/auxiliary/crateresolve5-1.rs b/src/test/auxiliary/crateresolve5-1.rs deleted file mode 100644 index eaec37ed417d..000000000000 --- a/src/test/auxiliary/crateresolve5-1.rs +++ /dev/null @@ -1,34 +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. - -#![crate_name="crateresolve5#0.1"] - -#![crate_type = "lib"] - -pub struct NameVal { pub name: String, pub val: isize } - -pub fn struct_nameval() -> NameVal { - NameVal { name: "crateresolve5".to_string(), val: 10 } -} - -pub enum e { - e_val -} - -pub fn nominal() -> e { e_val } - -pub fn nominal_eq(_e1: e, _e2: e) -> bool { true } - -impl PartialEq for e { - fn eq(&self, other: &e) -> bool { nominal_eq(*self, *other) } - fn ne(&self, other: &e) -> bool { !nominal_eq(*self, *other) } -} - -pub fn f() -> isize { 10 } diff --git a/src/test/auxiliary/crateresolve5-2.rs b/src/test/auxiliary/crateresolve5-2.rs deleted file mode 100644 index 14d28c709cdb..000000000000 --- a/src/test/auxiliary/crateresolve5-2.rs +++ /dev/null @@ -1,33 +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. - -#![crate_name="crateresolve5#0.2"] - -#![crate_type = "lib"] - -pub struct NameVal { pub name: String, pub val: isize } -pub fn struct_nameval() -> NameVal { - NameVal { name: "crateresolve5".to_string(), val: 10 } -} - -pub enum e { - e_val -} - -impl PartialEq for e { - fn eq(&self, other: &e) -> bool { !nominal_neq(*self, *other) } - fn ne(&self, other: &e) -> bool { nominal_neq(*self, *other) } -} - -pub fn nominal() -> e { e_val } - -pub fn nominal_neq(_e1: e, _e2: e) -> bool { false } - -pub fn f() -> isize { 20 } diff --git a/src/test/auxiliary/crateresolve7x.rs b/src/test/auxiliary/crateresolve7x.rs deleted file mode 100644 index c05d292eaea4..000000000000 --- a/src/test/auxiliary/crateresolve7x.rs +++ /dev/null @@ -1,23 +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. - -// aux-build:crateresolve_calories-1.rs -// aux-build:crateresolve_calories-2.rs - -// These both have the same version but differ in other metadata -pub mod a { - extern crate cr_1 (name = "crateresolve_calories", vers = "0.1", calories="100"); - pub fn f() -> isize { cr_1::f() } -} - -pub mod b { - extern crate cr_2 (name = "crateresolve_calories", vers = "0.1", calories="200"); - pub fn f() -> isize { cr_2::f() } -} diff --git a/src/test/auxiliary/crateresolve8-1.rs b/src/test/auxiliary/crateresolve8-1.rs deleted file mode 100644 index bc2a2d83bfec..000000000000 --- a/src/test/auxiliary/crateresolve8-1.rs +++ /dev/null @@ -1,16 +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. - -// default link meta for 'package_id' will be equal to filestem -#![crate_name="crateresolve8#0.1"] - -#![crate_type = "lib"] - -pub fn f() -> isize { 20 } diff --git a/src/test/auxiliary/crateresolve_calories-1.rs b/src/test/auxiliary/crateresolve_calories-1.rs deleted file mode 100644 index c1705d687abb..000000000000 --- a/src/test/auxiliary/crateresolve_calories-1.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. - -#![crate_name="crateresolve_calories#0.1"] -#![crate_type = "lib"] - -pub fn f() -> isize { 100 } diff --git a/src/test/auxiliary/crateresolve_calories-2.rs b/src/test/auxiliary/crateresolve_calories-2.rs deleted file mode 100644 index 2ae87daab4e2..000000000000 --- a/src/test/auxiliary/crateresolve_calories-2.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. - -#![crate_name="crateresolve_calories#0.1"] -#![crate_type = "lib"] - -pub fn f() -> isize { 200 }