diff --git a/src/test/auxiliary/associated-const-cc-lib.rs b/src/test/auxiliary/associated-const-cc-lib.rs index 3508fcd54af03..1fd8fee0117c5 100644 --- a/src/test/auxiliary/associated-const-cc-lib.rs +++ b/src/test/auxiliary/associated-const-cc-lib.rs @@ -12,10 +12,8 @@ #![crate_type="lib"] -use std::marker::MarkerTrait; - // These items are for testing that associated consts work cross-crate. -pub trait Foo: MarkerTrait { +pub trait Foo { const BAR: usize; } @@ -26,7 +24,7 @@ impl Foo for FooNoDefault { } // These test that defaults and default resolution work cross-crate. -pub trait FooDefault: MarkerTrait { +pub trait FooDefault { const BAR: usize = 1; } diff --git a/src/test/compile-fail/associated-const-impl-wrong-type.rs b/src/test/compile-fail/associated-const-impl-wrong-type.rs index d76147de3db2c..4f20d9e78ebd0 100644 --- a/src/test/compile-fail/associated-const-impl-wrong-type.rs +++ b/src/test/compile-fail/associated-const-impl-wrong-type.rs @@ -10,9 +10,7 @@ #![feature(associated_consts)] -use std::marker::MarkerTrait; - -trait Foo: MarkerTrait { +trait Foo { const BAR: u32; } diff --git a/src/test/compile-fail/associated-const-private-impl.rs b/src/test/compile-fail/associated-const-private-impl.rs index 4dfe7ea78c59e..be949db0281d2 100644 --- a/src/test/compile-fail/associated-const-private-impl.rs +++ b/src/test/compile-fail/associated-const-private-impl.rs @@ -10,8 +10,6 @@ #![feature(associated_consts)] -use std::marker::MarkerTrait; - mod bar1 { pub use self::bar2::Foo; mod bar2 { diff --git a/src/test/compile-fail/gated-associated_consts.rs b/src/test/compile-fail/gated-associated_consts.rs index d508016357c86..21672b18bde44 100644 --- a/src/test/compile-fail/gated-associated_consts.rs +++ b/src/test/compile-fail/gated-associated_consts.rs @@ -8,9 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use std::marker::MarkerTrait; - -trait MyTrait: MarkerTrait { +trait MyTrait { const C: bool; //~^ associated constants are experimental //~| add #![feature(associated_consts)] to the crate attributes to enable diff --git a/src/test/compile-fail/method-path-in-pattern.rs b/src/test/compile-fail/method-path-in-pattern.rs index 1d83f901cdb62..faf6d255c9afc 100644 --- a/src/test/compile-fail/method-path-in-pattern.rs +++ b/src/test/compile-fail/method-path-in-pattern.rs @@ -8,15 +8,13 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use std::marker::MarkerTrait; - struct Foo; impl Foo { fn bar(&self) {} } -trait MyTrait: MarkerTrait { +trait MyTrait { fn trait_bar() {} } diff --git a/src/test/compile-fail/method-resolvable-path-in-pattern.rs b/src/test/compile-fail/method-resolvable-path-in-pattern.rs index f3e93537203b3..0df824e7f535b 100644 --- a/src/test/compile-fail/method-resolvable-path-in-pattern.rs +++ b/src/test/compile-fail/method-resolvable-path-in-pattern.rs @@ -8,11 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use std::marker::MarkerTrait; - struct Foo; -trait MyTrait: MarkerTrait { +trait MyTrait { fn trait_bar() {} } diff --git a/src/test/run-pass/associated-const-match-patterns.rs b/src/test/run-pass/associated-const-match-patterns.rs index 63f77b351704b..eeaacbf9dcc78 100644 --- a/src/test/run-pass/associated-const-match-patterns.rs +++ b/src/test/run-pass/associated-const-match-patterns.rs @@ -10,8 +10,6 @@ #![feature(associated_consts)] -use std::marker::MarkerTrait; - struct Foo; enum Bar { @@ -24,7 +22,7 @@ impl Foo { const MYBAR: Bar = Bar::Var2; } -trait HasBar: MarkerTrait { +trait HasBar { const THEBAR: Bar; } diff --git a/src/test/run-pass/associated-const-overwrite-default.rs b/src/test/run-pass/associated-const-overwrite-default.rs index 5134ad3565956..0846ad9a571b3 100644 --- a/src/test/run-pass/associated-const-overwrite-default.rs +++ b/src/test/run-pass/associated-const-overwrite-default.rs @@ -10,9 +10,7 @@ #![feature(associated_consts)] -use std::marker::MarkerTrait; - -trait Foo: MarkerTrait { +trait Foo { const ID: i32 = 2; } diff --git a/src/test/run-pass/associated-const-public-impl.rs b/src/test/run-pass/associated-const-public-impl.rs index 686ac19dad155..b1d071799e1a8 100644 --- a/src/test/run-pass/associated-const-public-impl.rs +++ b/src/test/run-pass/associated-const-public-impl.rs @@ -10,8 +10,6 @@ #![feature(associated_consts)] -use std::marker::MarkerTrait; - mod bar1 { pub use self::bar2::Foo; mod bar2 { diff --git a/src/test/run-pass/associated-const-resolution-order.rs b/src/test/run-pass/associated-const-resolution-order.rs index ad20c084ff458..98b7164ab74ad 100644 --- a/src/test/run-pass/associated-const-resolution-order.rs +++ b/src/test/run-pass/associated-const-resolution-order.rs @@ -10,15 +10,13 @@ #![feature(associated_consts)] -use std::marker::MarkerTrait; - struct MyType; impl MyType { const IMPL_IS_INHERENT: bool = true; } -trait MyTrait: MarkerTrait { +trait MyTrait { const IMPL_IS_INHERENT: bool; const IMPL_IS_ON_TRAIT: bool; } diff --git a/src/test/run-pass/associated-const-self-type.rs b/src/test/run-pass/associated-const-self-type.rs index dc8b1307f7607..d3add976b5af8 100644 --- a/src/test/run-pass/associated-const-self-type.rs +++ b/src/test/run-pass/associated-const-self-type.rs @@ -10,9 +10,7 @@ #![feature(associated_consts)] -use std::marker::MarkerTrait; - -trait MyInt: MarkerTrait { +trait MyInt { const ONE: Self; } diff --git a/src/test/run-pass/associated-const-ufcs-infer-trait.rs b/src/test/run-pass/associated-const-ufcs-infer-trait.rs index 4cee76eb5aa42..aa3e14a939784 100644 --- a/src/test/run-pass/associated-const-ufcs-infer-trait.rs +++ b/src/test/run-pass/associated-const-ufcs-infer-trait.rs @@ -10,9 +10,7 @@ #![feature(associated_consts)] -use std::marker::MarkerTrait; - -trait Foo: MarkerTrait { +trait Foo { const ID: i32; } diff --git a/src/test/run-pass/associated-const-use-default.rs b/src/test/run-pass/associated-const-use-default.rs index 59df2fc41ed3a..5813d86742532 100644 --- a/src/test/run-pass/associated-const-use-default.rs +++ b/src/test/run-pass/associated-const-use-default.rs @@ -10,9 +10,7 @@ #![feature(associated_consts)] -use std::marker::MarkerTrait; - -trait Foo: MarkerTrait { +trait Foo { const ID: i32 = 1; } diff --git a/src/test/run-pass/associated-const-use-impl-of-same-trait.rs b/src/test/run-pass/associated-const-use-impl-of-same-trait.rs index 6c9c6767cbd2c..62658470baa52 100644 --- a/src/test/run-pass/associated-const-use-impl-of-same-trait.rs +++ b/src/test/run-pass/associated-const-use-impl-of-same-trait.rs @@ -10,13 +10,11 @@ #![feature(associated_consts)] -use std::marker::MarkerTrait; - // The main purpose of this test is to ensure that different impls of the same // trait can refer to each other without setting off the static recursion check // (as long as there's no actual recursion). -trait Foo: MarkerTrait { +trait Foo { const BAR: u32; } diff --git a/src/test/run-pass/associated-const.rs b/src/test/run-pass/associated-const.rs index 9214467275f5f..d906544500931 100644 --- a/src/test/run-pass/associated-const.rs +++ b/src/test/run-pass/associated-const.rs @@ -10,9 +10,7 @@ #![feature(associated_consts)] -use std::marker::MarkerTrait; - -trait Foo: MarkerTrait { +trait Foo { const ID: i32; }