From f4cd3c205431e987504b5e3ca56de74fab49deb3 Mon Sep 17 00:00:00 2001 From: Andrew Date: Sat, 22 Jun 2019 00:12:28 +0800 Subject: [PATCH] adding in these files that didn't get added in previous commit --- .../ui/traits/trait-alias/trait-alias-only-maybe-bound.rs | 4 ++-- src/test/ui/traits/trait-object-macro-matcher.rs | 2 +- src/test/ui/traits/trait-object-vs-lifetime-2.rs | 2 +- src/test/ui/traits/trait-object-vs-lifetime.rs | 4 ++-- src/test/ui/traits/wf-trait-object-only-maybe-bound.rs | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/test/ui/traits/trait-alias/trait-alias-only-maybe-bound.rs b/src/test/ui/traits/trait-alias/trait-alias-only-maybe-bound.rs index d6c611d2a4d91..e4abf314e0a96 100644 --- a/src/test/ui/traits/trait-alias/trait-alias-only-maybe-bound.rs +++ b/src/test/ui/traits/trait-alias/trait-alias-only-maybe-bound.rs @@ -11,12 +11,12 @@ trait _1 = _0; // Straight list expansion: type _T0 = dyn _1; -//~^ ERROR at least one non-builtin trait is required for an object type [E0224] +//~^ ERROR at least one trait is required for an object type [E0224] // Twice: trait _2 = _1 + _1; type _T1 = dyn _2; -//~^ ERROR at least one non-builtin trait is required for an object type [E0224] +//~^ ERROR at least one trait is required for an object type [E0224] fn main() {} diff --git a/src/test/ui/traits/trait-object-macro-matcher.rs b/src/test/ui/traits/trait-object-macro-matcher.rs index 5ec157275a629..a6852569f3a12 100644 --- a/src/test/ui/traits/trait-object-macro-matcher.rs +++ b/src/test/ui/traits/trait-object-macro-matcher.rs @@ -8,5 +8,5 @@ fn main() { m!(dyn Copy + Send + 'static); //~^ ERROR the trait `std::marker::Copy` cannot be made into an object m!(dyn 'static + Send); - m!(dyn 'static +); //~ ERROR at least one non-builtin trait is required for an object type + m!(dyn 'static +); //~ ERROR at least one trait is required for an object type } diff --git a/src/test/ui/traits/trait-object-vs-lifetime-2.rs b/src/test/ui/traits/trait-object-vs-lifetime-2.rs index 8a9b8e793487c..0b33dc7f69a3a 100644 --- a/src/test/ui/traits/trait-object-vs-lifetime-2.rs +++ b/src/test/ui/traits/trait-object-vs-lifetime-2.rs @@ -5,7 +5,7 @@ fn g() where 'static: 'static, dyn 'static +: 'static + Copy, - //~^ ERROR at least one non-builtin trait is required for an object type + //~^ ERROR at least one trait is required for an object type {} fn main() {} diff --git a/src/test/ui/traits/trait-object-vs-lifetime.rs b/src/test/ui/traits/trait-object-vs-lifetime.rs index 803b29367c8a8..e0ff734948376 100644 --- a/src/test/ui/traits/trait-object-vs-lifetime.rs +++ b/src/test/ui/traits/trait-object-vs-lifetime.rs @@ -7,11 +7,11 @@ fn main() { // `'static` is a lifetime argument, `'static +` is a type argument let _: S<'static, u8>; let _: S<'static, dyn 'static +>; - //~^ at least one non-builtin trait is required for an object type + //~^ at least one trait is required for an object type let _: S<'static, 'static>; //~^ ERROR wrong number of lifetime arguments: expected 1, found 2 //~| ERROR wrong number of type arguments: expected 1, found 0 let _: S; //~^ ERROR lifetime arguments must be declared prior to type arguments - //~| ERROR at least one non-builtin trait is required for an object type + //~| ERROR at least one trait is required for an object type } diff --git a/src/test/ui/traits/wf-trait-object-only-maybe-bound.rs b/src/test/ui/traits/wf-trait-object-only-maybe-bound.rs index 1b83d2487f4c6..3e6db3e997c9b 100644 --- a/src/test/ui/traits/wf-trait-object-only-maybe-bound.rs +++ b/src/test/ui/traits/wf-trait-object-only-maybe-bound.rs @@ -1,7 +1,7 @@ // Test that `dyn ?Sized` (i.e., a trait object with only a maybe buond) is not allowed. type _0 = dyn ?Sized; -//~^ ERROR at least one non-builtin trait is required for an object type [E0224] +//~^ ERROR at least one trait is required for an object type [E0224] //~| ERROR ?Trait` is not permitted in trait object types fn main() {}