Skip to content

Commit

Permalink
adding in these files that didn't get added in previous commit
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrew committed Jun 21, 2019
1 parent 54acbd9 commit f4cd3c2
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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() {}
2 changes: 1 addition & 1 deletion src/test/ui/traits/trait-object-macro-matcher.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
2 changes: 1 addition & 1 deletion src/test/ui/traits/trait-object-vs-lifetime-2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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() {}
4 changes: 2 additions & 2 deletions src/test/ui/traits/trait-object-vs-lifetime.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<dyn 'static +, 'static>;
//~^ 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
}
2 changes: 1 addition & 1 deletion src/test/ui/traits/wf-trait-object-only-maybe-bound.rs
Original file line number Diff line number Diff line change
@@ -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() {}

0 comments on commit f4cd3c2

Please sign in to comment.