diff options
Diffstat (limited to 'src/test')
14 files changed, 16 insertions, 16 deletions
diff --git a/src/test/compile-fail/associated-types-for-unimpl-trait.rs b/src/test/compile-fail/associated-types-for-unimpl-trait.rs index a8aee5fd0a5..9fa24850e03 100644 --- a/src/test/compile-fail/associated-types-for-unimpl-trait.rs +++ b/src/test/compile-fail/associated-types-for-unimpl-trait.rs @@ -15,7 +15,7 @@ trait Get { trait Other { fn uhoh<U:Get>(&self, foo: U, bar: <Self as Get>::Value) {} - //~^ ERROR the predicate `Self : Get` is not satisfied + //~^ ERROR the trait bound `Self : Get` is not satisfied } fn main() { diff --git a/src/test/compile-fail/associated-types-invalid-trait-ref-issue-18865.rs b/src/test/compile-fail/associated-types-invalid-trait-ref-issue-18865.rs index 32068633df6..18d9ea52ff2 100644 --- a/src/test/compile-fail/associated-types-invalid-trait-ref-issue-18865.rs +++ b/src/test/compile-fail/associated-types-invalid-trait-ref-issue-18865.rs @@ -18,7 +18,7 @@ trait Foo<T> { fn f<T:Foo<isize>>(t: &T) { let u: <T as Foo<usize>>::Bar = t.get_bar(); - //~^ ERROR the predicate `T : Foo<usize>` is not satisfied + //~^ ERROR the trait bound `T : Foo<usize>` is not satisfied } fn main() { } diff --git a/src/test/compile-fail/associated-types-no-suitable-bound.rs b/src/test/compile-fail/associated-types-no-suitable-bound.rs index 19f0e27fa55..0aafd193c90 100644 --- a/src/test/compile-fail/associated-types-no-suitable-bound.rs +++ b/src/test/compile-fail/associated-types-no-suitable-bound.rs @@ -19,7 +19,7 @@ struct Struct { impl Struct { fn uhoh<T>(foo: <T as Get>::Value) {} - //~^ ERROR the predicate `T : Get` is not satisfied + //~^ ERROR the trait bound `T : Get` is not satisfied } fn main() { diff --git a/src/test/compile-fail/associated-types-no-suitable-supertrait-2.rs b/src/test/compile-fail/associated-types-no-suitable-supertrait-2.rs index 63e76f7eeaa..225ee085701 100644 --- a/src/test/compile-fail/associated-types-no-suitable-supertrait-2.rs +++ b/src/test/compile-fail/associated-types-no-suitable-supertrait-2.rs @@ -25,7 +25,7 @@ trait Get { trait Other { fn uhoh<U:Get>(&self, foo: U, bar: <Self as Get>::Value) {} - //~^ ERROR the predicate `Self : Get` is not satisfied + //~^ ERROR the trait bound `Self : Get` is not satisfied } fn main() { } diff --git a/src/test/compile-fail/associated-types-no-suitable-supertrait.rs b/src/test/compile-fail/associated-types-no-suitable-supertrait.rs index 38f5be37bd1..fe519beef67 100644 --- a/src/test/compile-fail/associated-types-no-suitable-supertrait.rs +++ b/src/test/compile-fail/associated-types-no-suitable-supertrait.rs @@ -25,12 +25,12 @@ trait Get { trait Other { fn uhoh<U:Get>(&self, foo: U, bar: <Self as Get>::Value) {} - //~^ ERROR the predicate `Self : Get` is not satisfied + //~^ ERROR the trait bound `Self : Get` is not satisfied } impl<T:Get> Other for T { fn uhoh<U:Get>(&self, foo: U, bar: <(T, U) as Get>::Value) {} - //~^ ERROR the predicate `(T, U) : Get` is not satisfied + //~^ ERROR the trait bound `(T, U) : Get` is not satisfied } fn main() { } diff --git a/src/test/compile-fail/cast-rfc0401.rs b/src/test/compile-fail/cast-rfc0401.rs index 2bc4d82ef0a..c032fb43402 100644 --- a/src/test/compile-fail/cast-rfc0401.rs +++ b/src/test/compile-fail/cast-rfc0401.rs @@ -91,7 +91,7 @@ fn main() let _ = 42usize as *const [u8]; //~ ERROR casting let _ = v as *const [u8]; //~ ERROR cannot cast let _ = fat_v as *const Foo; - //~^ ERROR the predicate `[u8] : std::marker::Sized` is not satisfied + //~^ ERROR the trait bound `[u8] : std::marker::Sized` is not satisfied //~^^ HELP run `rustc --explain E0277` to see a detailed explanation //~^^^ NOTE `[u8]` does not have a constant size known at compile-time //~^^^^ NOTE required for the cast to the object type `Foo` @@ -106,7 +106,7 @@ fn main() let a : *const str = "hello"; let _ = a as *const Foo; - //~^ ERROR the predicate `str : std::marker::Sized` is not satisfied + //~^ ERROR the trait bound `str : std::marker::Sized` is not satisfied //~^^ HELP run `rustc --explain E0277` to see a detailed explanation //~^^^ NOTE `str` does not have a constant size known at compile-time //~^^^^ NOTE required for the cast to the object type `Foo` diff --git a/src/test/compile-fail/cross-fn-cache-hole.rs b/src/test/compile-fail/cross-fn-cache-hole.rs index eb063f5bc8c..0a3ce03f27b 100644 --- a/src/test/compile-fail/cross-fn-cache-hole.rs +++ b/src/test/compile-fail/cross-fn-cache-hole.rs @@ -23,7 +23,7 @@ trait Bar<X> { } // We don't always check where clauses for sanity, but in this case // wfcheck does report an error here: -fn vacuous<A>() //~ ERROR the predicate `i32 : Bar<u32>` is not satisfied +fn vacuous<A>() //~ ERROR the trait bound `i32 : Bar<u32>` is not satisfied where i32: Foo<u32, A> { // ... the original intention was to check that we don't use that diff --git a/src/test/compile-fail/issue-21659-show-relevant-trait-impls-1.rs b/src/test/compile-fail/issue-21659-show-relevant-trait-impls-1.rs index 452ae5df40a..7bc4adfa85d 100644 --- a/src/test/compile-fail/issue-21659-show-relevant-trait-impls-1.rs +++ b/src/test/compile-fail/issue-21659-show-relevant-trait-impls-1.rs @@ -32,7 +32,7 @@ fn main() { let f1 = Bar; f1.foo(1usize); - //~^ error: the predicate `Bar : Foo<usize>` is not satisfied + //~^ error: the trait bound `Bar : Foo<usize>` is not satisfied //~| help: the following implementations were found: //~| help: <Bar as Foo<i32>> //~| help: <Bar as Foo<u8>> diff --git a/src/test/compile-fail/issue-21659-show-relevant-trait-impls-2.rs b/src/test/compile-fail/issue-21659-show-relevant-trait-impls-2.rs index 8f52004f598..f4e53614472 100644 --- a/src/test/compile-fail/issue-21659-show-relevant-trait-impls-2.rs +++ b/src/test/compile-fail/issue-21659-show-relevant-trait-impls-2.rs @@ -36,7 +36,7 @@ fn main() { let f1 = Bar; f1.foo(1usize); - //~^ error: the predicate `Bar : Foo<usize>` is not satisfied + //~^ error: the trait bound `Bar : Foo<usize>` is not satisfied //~| help: the following implementations were found: //~| help: <Bar as Foo<i8>> //~| help: <Bar as Foo<i16>> diff --git a/src/test/compile-fail/wf-impl-associated-type-trait.rs b/src/test/compile-fail/wf-impl-associated-type-trait.rs index b797c9780ac..2fee2604a8a 100644 --- a/src/test/compile-fail/wf-impl-associated-type-trait.rs +++ b/src/test/compile-fail/wf-impl-associated-type-trait.rs @@ -25,7 +25,7 @@ pub trait Foo { impl<T> Foo for T { type Bar = MySet<T>; - //~^ ERROR the predicate `T : MyHash` is not satisfied + //~^ ERROR the trait bound `T : MyHash` is not satisfied } #[rustc_error] diff --git a/src/test/compile-fail/where-clause-constraints-are-local-for-inherent-impl.rs b/src/test/compile-fail/where-clause-constraints-are-local-for-inherent-impl.rs index 42e9fa2614c..4b85f2275a7 100644 --- a/src/test/compile-fail/where-clause-constraints-are-local-for-inherent-impl.rs +++ b/src/test/compile-fail/where-clause-constraints-are-local-for-inherent-impl.rs @@ -21,7 +21,7 @@ impl<T> Foo<T> { fn fails_copy(self) { require_copy(self.x); - //~^ ERROR the predicate `T : std::marker::Copy` is not satisfied + //~^ ERROR the trait bound `T : std::marker::Copy` is not satisfied } } diff --git a/src/test/compile-fail/where-clause-constraints-are-local-for-trait-impl.rs b/src/test/compile-fail/where-clause-constraints-are-local-for-trait-impl.rs index 889cf85221b..f55586982be 100644 --- a/src/test/compile-fail/where-clause-constraints-are-local-for-trait-impl.rs +++ b/src/test/compile-fail/where-clause-constraints-are-local-for-trait-impl.rs @@ -26,7 +26,7 @@ impl<T> Foo<T> for Bar<T> { fn fails_copy(self) { require_copy(self.x); - //~^ ERROR the predicate `T : std::marker::Copy` is not satisfied + //~^ ERROR the trait bound `T : std::marker::Copy` is not satisfied } } diff --git a/src/test/compile-fail/where-clause-method-substituion.rs b/src/test/compile-fail/where-clause-method-substituion.rs index 0f682582c3e..9f217f29bd1 100644 --- a/src/test/compile-fail/where-clause-method-substituion.rs +++ b/src/test/compile-fail/where-clause-method-substituion.rs @@ -28,5 +28,5 @@ impl Bar<X> for isize { fn main() { 1.method::<X>(); - //~^ ERROR the predicate `X : Foo<X>` is not satisfied + //~^ ERROR the trait bound `X : Foo<X>` is not satisfied } diff --git a/src/test/compile-fail/where-clauses-unsatisfied.rs b/src/test/compile-fail/where-clauses-unsatisfied.rs index 0410d7c0583..38470bc3de6 100644 --- a/src/test/compile-fail/where-clauses-unsatisfied.rs +++ b/src/test/compile-fail/where-clauses-unsatisfied.rs @@ -15,5 +15,5 @@ struct Struct; fn main() { drop(equal(&Struct, &Struct)) - //~^ ERROR the predicate `Struct : std::cmp::Eq` is not satisfied + //~^ ERROR the trait bound `Struct : std::cmp::Eq` is not satisfied } |