| Index: pkg/analyzer/test/src/task/strong/inferred_type_test.dart
|
| diff --git a/pkg/analyzer/test/src/task/strong/inferred_type_test.dart b/pkg/analyzer/test/src/task/strong/inferred_type_test.dart
|
| index 816d2d6ca50da6c3d97a13a34941396488790ead..c8f2e0150117050e0ff667dcebc4013f784ff56a 100644
|
| --- a/pkg/analyzer/test/src/task/strong/inferred_type_test.dart
|
| +++ b/pkg/analyzer/test/src/task/strong/inferred_type_test.dart
|
| @@ -1237,8 +1237,8 @@ void main() {
|
| A<int, String> a1 = /*info:INFERRED_TYPE_ALLOCATION*/new B.named("hello", 3);
|
| A<int, String> a2 = new B<String, int>("hello", 3);
|
| A<int, String> a3 = new B<String, int>.named("hello", 3);
|
| - A<int, String> a4 = /*error:STATIC_TYPE_ERROR*/new B<String, dynamic>("hello", 3);
|
| - A<int, String> a5 = /*error:STATIC_TYPE_ERROR*/new B<dynamic, dynamic>.named("hello", 3);
|
| + A<int, String> a4 = /*error:INVALID_ASSIGNMENT*/new B<String, dynamic>("hello", 3);
|
| + A<int, String> a5 = /*error:INVALID_ASSIGNMENT*/new B<dynamic, dynamic>.named("hello", 3);
|
| }
|
| {
|
| A<int, String> a0 = /*info:INFERRED_TYPE_ALLOCATION*/new B(
|
| @@ -1253,8 +1253,8 @@ void main() {
|
| A<int, int> a1 = /*info:INFERRED_TYPE_ALLOCATION*/new C.named(3);
|
| A<int, int> a2 = new C<int>(3);
|
| A<int, int> a3 = new C<int>.named(3);
|
| - A<int, int> a4 = /*error:STATIC_TYPE_ERROR*/new C<dynamic>(3);
|
| - A<int, int> a5 = /*error:STATIC_TYPE_ERROR*/new C<dynamic>.named(3);
|
| + A<int, int> a4 = /*error:INVALID_ASSIGNMENT*/new C<dynamic>(3);
|
| + A<int, int> a5 = /*error:INVALID_ASSIGNMENT*/new C<dynamic>.named(3);
|
| }
|
| {
|
| A<int, int> a0 = /*info:INFERRED_TYPE_ALLOCATION*/new C(
|
| @@ -1267,8 +1267,8 @@ void main() {
|
| A<int, String> a1 = /*info:INFERRED_TYPE_ALLOCATION*/new D.named("hello");
|
| A<int, String> a2 = new D<int, String>("hello");
|
| A<int, String> a3 = new D<String, String>.named("hello");
|
| - A<int, String> a4 = /*error:STATIC_TYPE_ERROR*/new D<num, dynamic>("hello");
|
| - A<int, String> a5 = /*error:STATIC_TYPE_ERROR*/new D<dynamic, dynamic>.named("hello");
|
| + A<int, String> a4 = /*error:INVALID_ASSIGNMENT*/new D<num, dynamic>("hello");
|
| + A<int, String> a5 = /*error:INVALID_ASSIGNMENT*/new D<dynamic, dynamic>.named("hello");
|
| }
|
| {
|
| A<int, String> a0 = /*info:INFERRED_TYPE_ALLOCATION*/new D(
|
| @@ -1761,11 +1761,11 @@ takeDDN(math.max);
|
| takeIIO(math.max);
|
| takeDDO(math.max);
|
|
|
| -takeOOI(/*error:STATIC_TYPE_ERROR,error:ARGUMENT_TYPE_NOT_ASSIGNABLE*/math.max);
|
| -takeIDI(/*error:STATIC_TYPE_ERROR,error:ARGUMENT_TYPE_NOT_ASSIGNABLE*/math.max);
|
| -takeDID(/*error:STATIC_TYPE_ERROR,error:ARGUMENT_TYPE_NOT_ASSIGNABLE*/math.max);
|
| -takeOON(/*error:STATIC_TYPE_ERROR,error:ARGUMENT_TYPE_NOT_ASSIGNABLE*/math.max);
|
| -takeOOO(/*error:STATIC_TYPE_ERROR,error:ARGUMENT_TYPE_NOT_ASSIGNABLE*/math.max);
|
| +takeOOI(/*error:ARGUMENT_TYPE_NOT_ASSIGNABLE*/math.max);
|
| +takeIDI(/*error:ARGUMENT_TYPE_NOT_ASSIGNABLE*/math.max);
|
| +takeDID(/*error:ARGUMENT_TYPE_NOT_ASSIGNABLE*/math.max);
|
| +takeOON(/*error:ARGUMENT_TYPE_NOT_ASSIGNABLE*/math.max);
|
| +takeOOO(/*error:ARGUMENT_TYPE_NOT_ASSIGNABLE*/math.max);
|
|
|
| // Also test SimpleIdentifier
|
| takeIII(min);
|
| @@ -1778,11 +1778,11 @@ takeDDN(min);
|
| takeIIO(min);
|
| takeDDO(min);
|
|
|
| -takeOOI(/*error:STATIC_TYPE_ERROR,error:ARGUMENT_TYPE_NOT_ASSIGNABLE*/min);
|
| -takeIDI(/*error:STATIC_TYPE_ERROR,error:ARGUMENT_TYPE_NOT_ASSIGNABLE*/min);
|
| -takeDID(/*error:STATIC_TYPE_ERROR,error:ARGUMENT_TYPE_NOT_ASSIGNABLE*/min);
|
| -takeOON(/*error:STATIC_TYPE_ERROR,error:ARGUMENT_TYPE_NOT_ASSIGNABLE*/min);
|
| -takeOOO(/*error:STATIC_TYPE_ERROR,error:ARGUMENT_TYPE_NOT_ASSIGNABLE*/min);
|
| +takeOOI(/*error:ARGUMENT_TYPE_NOT_ASSIGNABLE*/min);
|
| +takeIDI(/*error:ARGUMENT_TYPE_NOT_ASSIGNABLE*/min);
|
| +takeDID(/*error:ARGUMENT_TYPE_NOT_ASSIGNABLE*/min);
|
| +takeOON(/*error:ARGUMENT_TYPE_NOT_ASSIGNABLE*/min);
|
| +takeOOO(/*error:ARGUMENT_TYPE_NOT_ASSIGNABLE*/min);
|
|
|
| // Also PropertyAccess
|
| takeIII(new C().m);
|
| @@ -1804,14 +1804,14 @@ takeDDO(new C().m);
|
| //
|
| // That's legal because we're loosening parameter types.
|
| //
|
| -takeOON(/*warning:DOWN_CAST_COMPOSITE,error:ARGUMENT_TYPE_NOT_ASSIGNABLE*/new C().m);
|
| -takeOOO(/*warning:DOWN_CAST_COMPOSITE,error:ARGUMENT_TYPE_NOT_ASSIGNABLE*/new C().m);
|
| +takeOON(/*error:ARGUMENT_TYPE_NOT_ASSIGNABLE*/new C().m);
|
| +takeOOO(/*error:ARGUMENT_TYPE_NOT_ASSIGNABLE*/new C().m);
|
|
|
| // Note: this is a warning because a downcast of a method tear-off could work
|
| // in "normal" Dart, due to bivariance.
|
| -takeOOI(/*warning:DOWN_CAST_COMPOSITE,error:ARGUMENT_TYPE_NOT_ASSIGNABLE*/new C().m);
|
| -takeIDI(/*warning:DOWN_CAST_COMPOSITE,error:ARGUMENT_TYPE_NOT_ASSIGNABLE*/new C().m);
|
| -takeDID(/*warning:DOWN_CAST_COMPOSITE,error:ARGUMENT_TYPE_NOT_ASSIGNABLE*/new C().m);
|
| +takeOOI(/*error:ARGUMENT_TYPE_NOT_ASSIGNABLE*/new C().m);
|
| +takeIDI(/*error:ARGUMENT_TYPE_NOT_ASSIGNABLE*/new C().m);
|
| +takeDID(/*error:ARGUMENT_TYPE_NOT_ASSIGNABLE*/new C().m);
|
| }
|
|
|
| void takeIII(int fn(int a, int b)) {}
|
|
|