From 3e9d5938cc4030de2e8c8e140633cc4d7d58733c Mon Sep 17 00:00:00 2001 From: Huon Wilson Date: Mon, 5 Jan 2015 17:36:00 +1100 Subject: [PATCH] Remove uses of default_type_params feature gate from tests. --- src/test/auxiliary/default_type_params_xc.rs | 2 -- .../associated-types-ICE-when-projecting-out-of-err.rs | 2 +- src/test/compile-fail/binop-consume-args.rs | 2 -- src/test/compile-fail/binop-move-semantics.rs | 2 -- src/test/compile-fail/borrowck-loan-rcvr-overloaded-op.rs | 2 -- .../compile-fail/generic-impl-less-params-with-defaults.rs | 2 -- .../compile-fail/generic-impl-more-params-with-defaults.rs | 2 -- src/test/compile-fail/generic-non-trailing-defaults.rs | 2 -- .../compile-fail/generic-type-less-params-with-defaults.rs | 2 -- .../compile-fail/generic-type-more-params-with-defaults.rs | 2 -- src/test/compile-fail/generic-type-params-forward-mention.rs | 2 -- src/test/compile-fail/generic-type-params-name-repr.rs | 2 -- src/test/compile-fail/unboxed-closure-sugar-default.rs | 2 +- src/test/compile-fail/unboxed-closure-sugar-region.rs | 2 +- src/test/compile-fail/wrong-mul-method-signature.rs | 2 -- src/test/run-pass/associated-types-conditional-dispatch.rs | 2 -- src/test/run-pass/eq-multidispatch.rs | 2 -- src/test/run-pass/generic-default-type-params-cross-crate.rs | 2 -- src/test/run-pass/generic-default-type-params.rs | 2 -- src/test/run-pass/issue-11709.rs | 2 -- src/test/run-pass/issue-14933.rs | 2 -- src/test/run-pass/issue-17897.rs | 2 +- src/test/run-pass/issue-18188.rs | 2 +- src/test/run-pass/issue-3609.rs | 2 -- src/test/run-pass/issue-3743.rs | 2 +- src/test/run-pass/operator-multidispatch.rs | 2 -- src/test/run-pass/overloaded-calls-param-vtables.rs | 3 +-- 27 files changed, 7 insertions(+), 48 deletions(-) diff --git a/src/test/auxiliary/default_type_params_xc.rs b/src/test/auxiliary/default_type_params_xc.rs index 0e0a2065008..d12f716decf 100644 --- a/src/test/auxiliary/default_type_params_xc.rs +++ b/src/test/auxiliary/default_type_params_xc.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(default_type_params)] - pub struct Heap; pub struct FakeHeap; diff --git a/src/test/compile-fail/associated-types-ICE-when-projecting-out-of-err.rs b/src/test/compile-fail/associated-types-ICE-when-projecting-out-of-err.rs index 0abec3e1d12..f67f65ec2ef 100644 --- a/src/test/compile-fail/associated-types-ICE-when-projecting-out-of-err.rs +++ b/src/test/compile-fail/associated-types-ICE-when-projecting-out-of-err.rs @@ -12,7 +12,7 @@ // just propagate the error. #![crate_type = "lib"] -#![feature(default_type_params, lang_items)] +#![feature(lang_items)] #![no_std] #[lang="sized"] diff --git a/src/test/compile-fail/binop-consume-args.rs b/src/test/compile-fail/binop-consume-args.rs index 2f26059330e..c525a67c7e9 100644 --- a/src/test/compile-fail/binop-consume-args.rs +++ b/src/test/compile-fail/binop-consume-args.rs @@ -10,8 +10,6 @@ // Test that binary operators consume their arguments -#![feature(default_type_params)] - use std::ops::{Add, Sub, Mul, Div, Rem, BitAnd, BitXor, BitOr, Shl, Shr}; fn add, B>(lhs: A, rhs: B) { diff --git a/src/test/compile-fail/binop-move-semantics.rs b/src/test/compile-fail/binop-move-semantics.rs index 65e3564d913..ffc38cc0a60 100644 --- a/src/test/compile-fail/binop-move-semantics.rs +++ b/src/test/compile-fail/binop-move-semantics.rs @@ -10,8 +10,6 @@ // Test that move restrictions are enforced on overloaded binary operations -#![feature(default_type_params)] - use std::ops::Add; fn double_move>(x: T) { diff --git a/src/test/compile-fail/borrowck-loan-rcvr-overloaded-op.rs b/src/test/compile-fail/borrowck-loan-rcvr-overloaded-op.rs index 96782e226c4..5aa2deb44f1 100644 --- a/src/test/compile-fail/borrowck-loan-rcvr-overloaded-op.rs +++ b/src/test/compile-fail/borrowck-loan-rcvr-overloaded-op.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(default_type_params)] - use std::ops::Add; #[derive(Copy)] diff --git a/src/test/compile-fail/generic-impl-less-params-with-defaults.rs b/src/test/compile-fail/generic-impl-less-params-with-defaults.rs index 7e7eee3cfac..a8b1911426c 100644 --- a/src/test/compile-fail/generic-impl-less-params-with-defaults.rs +++ b/src/test/compile-fail/generic-impl-less-params-with-defaults.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(default_type_params)] - struct Foo; impl Foo { diff --git a/src/test/compile-fail/generic-impl-more-params-with-defaults.rs b/src/test/compile-fail/generic-impl-more-params-with-defaults.rs index ceaed9438be..696235333a1 100644 --- a/src/test/compile-fail/generic-impl-more-params-with-defaults.rs +++ b/src/test/compile-fail/generic-impl-more-params-with-defaults.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(default_type_params)] - struct Heap; struct Vec; diff --git a/src/test/compile-fail/generic-non-trailing-defaults.rs b/src/test/compile-fail/generic-non-trailing-defaults.rs index 0b6480fc17d..0cfb05b9332 100644 --- a/src/test/compile-fail/generic-non-trailing-defaults.rs +++ b/src/test/compile-fail/generic-non-trailing-defaults.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(default_type_params)] - struct Heap; struct Vec; //~ ERROR type parameters with a default must be trailing diff --git a/src/test/compile-fail/generic-type-less-params-with-defaults.rs b/src/test/compile-fail/generic-type-less-params-with-defaults.rs index ec226061e2a..f25d8f99b8d 100644 --- a/src/test/compile-fail/generic-type-less-params-with-defaults.rs +++ b/src/test/compile-fail/generic-type-less-params-with-defaults.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(default_type_params)] - struct Heap; struct Vec; diff --git a/src/test/compile-fail/generic-type-more-params-with-defaults.rs b/src/test/compile-fail/generic-type-more-params-with-defaults.rs index b16abd17575..ee3e1818779 100644 --- a/src/test/compile-fail/generic-type-more-params-with-defaults.rs +++ b/src/test/compile-fail/generic-type-more-params-with-defaults.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(default_type_params)] - struct Heap; struct Vec; diff --git a/src/test/compile-fail/generic-type-params-forward-mention.rs b/src/test/compile-fail/generic-type-params-forward-mention.rs index ace53fb51a4..eda1b014fa7 100644 --- a/src/test/compile-fail/generic-type-params-forward-mention.rs +++ b/src/test/compile-fail/generic-type-params-forward-mention.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(default_type_params)] - // Ensure that we get an error and not an ICE for this problematic case. struct Foo, U = bool>; //~^ ERROR type parameters with a default cannot use forward declared identifiers diff --git a/src/test/compile-fail/generic-type-params-name-repr.rs b/src/test/compile-fail/generic-type-params-name-repr.rs index 1c14644ec18..5bdee543d73 100644 --- a/src/test/compile-fail/generic-type-params-name-repr.rs +++ b/src/test/compile-fail/generic-type-params-name-repr.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(default_type_params)] - struct A; struct B; struct C; diff --git a/src/test/compile-fail/unboxed-closure-sugar-default.rs b/src/test/compile-fail/unboxed-closure-sugar-default.rs index 06a93406392..a7861c4b90d 100644 --- a/src/test/compile-fail/unboxed-closure-sugar-default.rs +++ b/src/test/compile-fail/unboxed-closure-sugar-default.rs @@ -11,7 +11,7 @@ // Test interaction between unboxed closure sugar and default type // parameters (should be exactly as if angle brackets were used). -#![feature(default_type_params, unboxed_closures)] +#![feature(unboxed_closures)] #![allow(dead_code)] trait Foo { diff --git a/src/test/compile-fail/unboxed-closure-sugar-region.rs b/src/test/compile-fail/unboxed-closure-sugar-region.rs index a938f126c16..df53ecdac7c 100644 --- a/src/test/compile-fail/unboxed-closure-sugar-region.rs +++ b/src/test/compile-fail/unboxed-closure-sugar-region.rs @@ -12,7 +12,7 @@ // parameters (should be exactly as if angle brackets were used // and regions omitted). -#![feature(default_type_params, unboxed_closures)] +#![feature(unboxed_closures)] #![allow(dead_code)] use std::kinds::marker; diff --git a/src/test/compile-fail/wrong-mul-method-signature.rs b/src/test/compile-fail/wrong-mul-method-signature.rs index 30609ddc944..e6fbcf2d38f 100644 --- a/src/test/compile-fail/wrong-mul-method-signature.rs +++ b/src/test/compile-fail/wrong-mul-method-signature.rs @@ -13,8 +13,6 @@ // (In this case the mul method should take &f64 and not f64) // See: #11450 -#![feature(default_type_params)] - use std::ops::Mul; struct Vec1 { diff --git a/src/test/run-pass/associated-types-conditional-dispatch.rs b/src/test/run-pass/associated-types-conditional-dispatch.rs index d05275e6ffe..46cf9110476 100644 --- a/src/test/run-pass/associated-types-conditional-dispatch.rs +++ b/src/test/run-pass/associated-types-conditional-dispatch.rs @@ -14,8 +14,6 @@ // `Target=[A]`, then the impl marked with `(*)` is seen to conflict // with all the others. -#![feature(default_type_params)] - use std::ops::Deref; pub trait MyEq for Sized? { diff --git a/src/test/run-pass/eq-multidispatch.rs b/src/test/run-pass/eq-multidispatch.rs index 31ed212db99..2dcf6bf6d09 100644 --- a/src/test/run-pass/eq-multidispatch.rs +++ b/src/test/run-pass/eq-multidispatch.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(default_type_params)] - #[derive(PartialEq)] struct Bar; struct Baz; diff --git a/src/test/run-pass/generic-default-type-params-cross-crate.rs b/src/test/run-pass/generic-default-type-params-cross-crate.rs index bb956b9ed89..ed8c6e73255 100644 --- a/src/test/run-pass/generic-default-type-params-cross-crate.rs +++ b/src/test/run-pass/generic-default-type-params-cross-crate.rs @@ -10,8 +10,6 @@ // aux-build:default_type_params_xc.rs -#![feature(default_type_params)] - extern crate default_type_params_xc; struct Vec; diff --git a/src/test/run-pass/generic-default-type-params.rs b/src/test/run-pass/generic-default-type-params.rs index e88801f14ed..5ec478d39e3 100644 --- a/src/test/run-pass/generic-default-type-params.rs +++ b/src/test/run-pass/generic-default-type-params.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(default_type_params)] - struct Foo { a: A } diff --git a/src/test/run-pass/issue-11709.rs b/src/test/run-pass/issue-11709.rs index f9d79567932..4a07b5fc432 100644 --- a/src/test/run-pass/issue-11709.rs +++ b/src/test/run-pass/issue-11709.rs @@ -15,8 +15,6 @@ // when this bug was opened. The cases where the compiler // panics before the fix have a comment. -#![feature(default_type_params)] - use std::thunk::Thunk; struct S {x:()} diff --git a/src/test/run-pass/issue-14933.rs b/src/test/run-pass/issue-14933.rs index 9796322b264..549ed08aaf3 100644 --- a/src/test/run-pass/issue-14933.rs +++ b/src/test/run-pass/issue-14933.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(default_type_params)] - pub type BigRat = T; fn main() {} diff --git a/src/test/run-pass/issue-17897.rs b/src/test/run-pass/issue-17897.rs index 49b03a974d8..da6c83142ea 100644 --- a/src/test/run-pass/issue-17897.rs +++ b/src/test/run-pass/issue-17897.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(default_type_params, unboxed_closures)] +#![feature(unboxed_closures)] use std::thunk::Thunk; diff --git a/src/test/run-pass/issue-18188.rs b/src/test/run-pass/issue-18188.rs index aa95856a8b5..a2152db6884 100644 --- a/src/test/run-pass/issue-18188.rs +++ b/src/test/run-pass/issue-18188.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(default_type_params, unboxed_closures)] +#![feature(unboxed_closures)] use std::thunk::Thunk; diff --git a/src/test/run-pass/issue-3609.rs b/src/test/run-pass/issue-3609.rs index b89ee81a727..c3cfaf22dee 100644 --- a/src/test/run-pass/issue-3609.rs +++ b/src/test/run-pass/issue-3609.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(default_type_params)] - use std::thread::Thread; use std::sync::mpsc::Sender; use std::thunk::Invoke; diff --git a/src/test/run-pass/issue-3743.rs b/src/test/run-pass/issue-3743.rs index 8868b6905ad..43852fb3324 100644 --- a/src/test/run-pass/issue-3743.rs +++ b/src/test/run-pass/issue-3743.rs @@ -10,7 +10,7 @@ // If `Mul` used an associated type for its output, this test would // work more smoothly. -#![feature(default_type_params, old_orphan_check)] +#![feature(old_orphan_check)] use std::ops::Mul; diff --git a/src/test/run-pass/operator-multidispatch.rs b/src/test/run-pass/operator-multidispatch.rs index 7e1a8d8d701..8e5750005e2 100644 --- a/src/test/run-pass/operator-multidispatch.rs +++ b/src/test/run-pass/operator-multidispatch.rs @@ -11,8 +11,6 @@ // Test that we can overload the `+` operator for points so that two // points can be added, and a point can be added to an integer. -#![feature(default_type_params)] - use std::ops; #[derive(Show,PartialEq,Eq)] diff --git a/src/test/run-pass/overloaded-calls-param-vtables.rs b/src/test/run-pass/overloaded-calls-param-vtables.rs index b3c9ec3dc93..56887636d5d 100644 --- a/src/test/run-pass/overloaded-calls-param-vtables.rs +++ b/src/test/run-pass/overloaded-calls-param-vtables.rs @@ -10,7 +10,7 @@ // Tests that nested vtables work with overloaded calls. -#![feature(default_type_params, unboxed_closures)] +#![feature(unboxed_closures)] use std::ops::Fn; use std::ops::Add; @@ -27,4 +27,3 @@ fn main() { // ICE trigger G(1i); } -