Skip to content

Commit f4cd3c2

Browse files
author
Andrew
committed
adding in these files that didn't get added in previous commit
1 parent 54acbd9 commit f4cd3c2

5 files changed

+7
-7
lines changed

Diff for: src/test/ui/traits/trait-alias/trait-alias-only-maybe-bound.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ trait _1 = _0;
1111

1212
// Straight list expansion:
1313
type _T0 = dyn _1;
14-
//~^ ERROR at least one non-builtin trait is required for an object type [E0224]
14+
//~^ ERROR at least one trait is required for an object type [E0224]
1515

1616
// Twice:
1717
trait _2 = _1 + _1;
1818

1919
type _T1 = dyn _2;
20-
//~^ ERROR at least one non-builtin trait is required for an object type [E0224]
20+
//~^ ERROR at least one trait is required for an object type [E0224]
2121

2222
fn main() {}

Diff for: src/test/ui/traits/trait-object-macro-matcher.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ fn main() {
88
m!(dyn Copy + Send + 'static);
99
//~^ ERROR the trait `std::marker::Copy` cannot be made into an object
1010
m!(dyn 'static + Send);
11-
m!(dyn 'static +); //~ ERROR at least one non-builtin trait is required for an object type
11+
m!(dyn 'static +); //~ ERROR at least one trait is required for an object type
1212
}

Diff for: src/test/ui/traits/trait-object-vs-lifetime-2.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
fn g() where
66
'static: 'static,
77
dyn 'static +: 'static + Copy,
8-
//~^ ERROR at least one non-builtin trait is required for an object type
8+
//~^ ERROR at least one trait is required for an object type
99
{}
1010

1111
fn main() {}

Diff for: src/test/ui/traits/trait-object-vs-lifetime.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ fn main() {
77
// `'static` is a lifetime argument, `'static +` is a type argument
88
let _: S<'static, u8>;
99
let _: S<'static, dyn 'static +>;
10-
//~^ at least one non-builtin trait is required for an object type
10+
//~^ at least one trait is required for an object type
1111
let _: S<'static, 'static>;
1212
//~^ ERROR wrong number of lifetime arguments: expected 1, found 2
1313
//~| ERROR wrong number of type arguments: expected 1, found 0
1414
let _: S<dyn 'static +, 'static>;
1515
//~^ ERROR lifetime arguments must be declared prior to type arguments
16-
//~| ERROR at least one non-builtin trait is required for an object type
16+
//~| ERROR at least one trait is required for an object type
1717
}
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Test that `dyn ?Sized` (i.e., a trait object with only a maybe buond) is not allowed.
22

33
type _0 = dyn ?Sized;
4-
//~^ ERROR at least one non-builtin trait is required for an object type [E0224]
4+
//~^ ERROR at least one trait is required for an object type [E0224]
55
//~| ERROR ?Trait` is not permitted in trait object types
66

77
fn main() {}

0 commit comments

Comments
 (0)