diff options
| author | Nick Cameron <ncameron@mozilla.com> | 2015-04-10 12:25:40 +1200 |
|---|---|---|
| committer | Nick Cameron <ncameron@mozilla.com> | 2015-04-14 21:55:42 +1200 |
| commit | 73c2e768d6ba55bdfb8292320ebac00e69ca2e42 (patch) | |
| tree | fb6f8a5f718bcaa8729d21a4f2526604a17d8994 /src/test/compile-fail | |
| parent | 4e8e64140ff60d1a20d7e54369db714a9fcd8b96 (diff) | |
| download | rust-73c2e768d6ba55bdfb8292320ebac00e69ca2e42.tar.gz rust-73c2e768d6ba55bdfb8292320ebac00e69ca2e42.zip | |
Rebased
Diffstat (limited to 'src/test/compile-fail')
| -rw-r--r-- | src/test/compile-fail/associated-type-projection-from-multiple-supertraits.rs | 5 | ||||
| -rw-r--r-- | src/test/compile-fail/issue-22560.rs | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/test/compile-fail/associated-type-projection-from-multiple-supertraits.rs b/src/test/compile-fail/associated-type-projection-from-multiple-supertraits.rs index c18d72c445b..2b34fcab24c 100644 --- a/src/test/compile-fail/associated-type-projection-from-multiple-supertraits.rs +++ b/src/test/compile-fail/associated-type-projection-from-multiple-supertraits.rs @@ -34,8 +34,9 @@ fn dent<C:BoxCar>(c: C, color: C::Color) { fn dent_object<COLOR>(c: BoxCar<Color=COLOR>) { //~^ ERROR ambiguous associated type - //~| ERROR the associated type `Color` (from the trait `Box`) must be specified - //~| ERROR the associated type `Color` (from the trait `Vehicle`) must be specified + //~| ERROR the value of the associated type `Color` (from the trait `Vehicle`) must be specified + //~| NOTE could derive from `Vehicle` + //~| NOTE could derive from `Box` } fn paint<C:BoxCar>(c: C, d: C::Color) { diff --git a/src/test/compile-fail/issue-22560.rs b/src/test/compile-fail/issue-22560.rs index b458e10a89c..a05bbe4960e 100644 --- a/src/test/compile-fail/issue-22560.rs +++ b/src/test/compile-fail/issue-22560.rs @@ -14,6 +14,7 @@ use std::ops::{Add, Sub}; type Test = Add + //~^ ERROR the type parameter `RHS` must be explicitly specified in an object type because its default value `Self` references the type `Self` + //~^^ ERROR the value of the associated type `Output` (from the trait `core::ops::Add`) must be specified [E0191] Sub; //~^ ERROR only the builtin traits can be used as closure or object bounds |