Skip to content

Commit e90f67d

Browse files
committed
Accept new baselines
1 parent 0e0953f commit e90f67d

File tree

2 files changed

+42
-16
lines changed

2 files changed

+42
-16
lines changed

tests/baselines/reference/nonPrimitiveInGeneric.errors.txt

+22-11
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
1-
tests/cases/conformance/types/nonPrimitive/nonPrimitiveInGeneric.ts(7,17): error TS2345: Argument of type '123' is not assignable to parameter of type 'object'.
2-
tests/cases/conformance/types/nonPrimitive/nonPrimitiveInGeneric.ts(8,17): error TS2345: Argument of type 'string' is not assignable to parameter of type 'object'.
3-
tests/cases/conformance/types/nonPrimitive/nonPrimitiveInGeneric.ts(14,7): error TS2345: Argument of type '123' is not assignable to parameter of type 'object'.
4-
tests/cases/conformance/types/nonPrimitive/nonPrimitiveInGeneric.ts(15,7): error TS2345: Argument of type 'string' is not assignable to parameter of type 'object'.
5-
tests/cases/conformance/types/nonPrimitive/nonPrimitiveInGeneric.ts(21,8): error TS2344: Type 'number' does not satisfy the constraint 'object'.
6-
tests/cases/conformance/types/nonPrimitive/nonPrimitiveInGeneric.ts(22,8): error TS2344: Type 'string' does not satisfy the constraint 'object'.
7-
tests/cases/conformance/types/nonPrimitive/nonPrimitiveInGeneric.ts(26,14): error TS2344: Type 'number' does not satisfy the constraint 'object'.
1+
tests/cases/conformance/types/nonPrimitive/nonPrimitiveInGeneric.ts(2,9): error TS2322: Type 'T' is not assignable to type 'object'.
2+
tests/cases/conformance/types/nonPrimitive/nonPrimitiveInGeneric.ts(9,17): error TS2345: Argument of type '123' is not assignable to parameter of type 'object'.
3+
tests/cases/conformance/types/nonPrimitive/nonPrimitiveInGeneric.ts(10,17): error TS2345: Argument of type 'string' is not assignable to parameter of type 'object'.
4+
tests/cases/conformance/types/nonPrimitive/nonPrimitiveInGeneric.ts(18,7): error TS2345: Argument of type '123' is not assignable to parameter of type 'object'.
5+
tests/cases/conformance/types/nonPrimitive/nonPrimitiveInGeneric.ts(19,7): error TS2345: Argument of type 'string' is not assignable to parameter of type 'object'.
6+
tests/cases/conformance/types/nonPrimitive/nonPrimitiveInGeneric.ts(25,8): error TS2344: Type 'number' does not satisfy the constraint 'object'.
7+
tests/cases/conformance/types/nonPrimitive/nonPrimitiveInGeneric.ts(26,8): error TS2344: Type 'string' does not satisfy the constraint 'object'.
8+
tests/cases/conformance/types/nonPrimitive/nonPrimitiveInGeneric.ts(34,14): error TS2344: Type 'number' does not satisfy the constraint 'object'.
89

910

10-
==== tests/cases/conformance/types/nonPrimitive/nonPrimitiveInGeneric.ts (7 errors) ====
11-
function generic<T>(t: T) {}
11+
==== tests/cases/conformance/types/nonPrimitive/nonPrimitiveInGeneric.ts (8 errors) ====
12+
function generic<T>(t: T) {
13+
var o: object = t; // expect error
14+
~
15+
!!! error TS2322: Type 'T' is not assignable to type 'object'.
16+
}
1217
var a = {};
1318
var b = "42";
1419

@@ -21,7 +26,9 @@ tests/cases/conformance/types/nonPrimitive/nonPrimitiveInGeneric.ts(26,14): erro
2126
~
2227
!!! error TS2345: Argument of type 'string' is not assignable to parameter of type 'object'.
2328

24-
function bound<T extends object>(t: T) {}
29+
function bound<T extends object>(t: T) {
30+
var o: object = t; // ok
31+
}
2532

2633
bound({});
2734
bound(a);
@@ -43,6 +50,10 @@ tests/cases/conformance/types/nonPrimitive/nonPrimitiveInGeneric.ts(26,14): erro
4350
~~~~~~
4451
!!! error TS2344: Type 'string' does not satisfy the constraint 'object'.
4552

53+
function bound3<T extends {}>(t: T) {
54+
var o: object = t; // ok
55+
}
56+
4657
interface Proxy<T extends object> {}
4758

4859
var x: Proxy<number>; // error
@@ -53,7 +64,7 @@ tests/cases/conformance/types/nonPrimitive/nonPrimitiveInGeneric.ts(26,14): erro
5364

5465

5566
interface Blah {
56-
foo: number;
67+
foo: number;
5768
}
5869

5970
var u: Proxy<Blah>; // ok

tests/baselines/reference/nonPrimitiveInGeneric.js

+20-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
//// [nonPrimitiveInGeneric.ts]
2-
function generic<T>(t: T) {}
2+
function generic<T>(t: T) {
3+
var o: object = t; // expect error
4+
}
35
var a = {};
46
var b = "42";
57

@@ -8,7 +10,9 @@ generic<object>(a);
810
generic<object>(123); // expect error
911
generic<object>(b); // expect error
1012

11-
function bound<T extends object>(t: T) {}
13+
function bound<T extends object>(t: T) {
14+
var o: object = t; // ok
15+
}
1216

1317
bound({});
1418
bound(a);
@@ -22,6 +26,10 @@ bound2<Object>();
2226
bound2<number>(); // expect error
2327
bound2<string>(); // expect error
2428

29+
function bound3<T extends {}>(t: T) {
30+
var o: object = t; // ok
31+
}
32+
2533
interface Proxy<T extends object> {}
2634

2735
var x: Proxy<number>; // error
@@ -30,21 +38,25 @@ var z: Proxy<undefined> ; // ok
3038

3139

3240
interface Blah {
33-
foo: number;
41+
foo: number;
3442
}
3543

3644
var u: Proxy<Blah>; // ok
3745

3846

3947
//// [nonPrimitiveInGeneric.js]
40-
function generic(t) { }
48+
function generic(t) {
49+
var o = t; // expect error
50+
}
4151
var a = {};
4252
var b = "42";
4353
generic({});
4454
generic(a);
4555
generic(123); // expect error
4656
generic(b); // expect error
47-
function bound(t) { }
57+
function bound(t) {
58+
var o = t; // ok
59+
}
4860
bound({});
4961
bound(a);
5062
bound(123); // expect error
@@ -54,6 +66,9 @@ bound2();
5466
bound2();
5567
bound2(); // expect error
5668
bound2(); // expect error
69+
function bound3(t) {
70+
var o = t; // ok
71+
}
5772
var x; // error
5873
var y; // ok
5974
var z; // ok

0 commit comments

Comments
 (0)