Skip to content

Commit bd0833a

Browse files
ahejlsbergahejlsberg
committed
Accept new baselines
1 parent 79a73bf commit bd0833a

File tree

4 files changed

+22
-26
lines changed

4 files changed

+22
-26
lines changed

‎tests/baselines/reference/complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.errors.txt‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,14 @@ tests/cases/compiler/complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.t
99
Type '"text" | "email"' is not assignable to type 'ChannelOfType<T, TextChannel>["type"]'.
1010
Type '"text"' is not assignable to type 'ChannelOfType<T, TextChannel>["type"]'.
1111
Type '"text"' is not assignable to type 'T & "text"'.
12-
Type '"text"' is not assignable to type 'T'.
13-
'"text"' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint '"text" | "email"'.
14-
Type 'T' is not assignable to type 'T & "text"'.
15-
Type '"text" | "email"' is not assignable to type 'T & "text"'.
16-
Type '"text"' is not assignable to type 'T & "text"'.
17-
Type '"text"' is not assignable to type 'T'.
18-
'"text"' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint '"text" | "email"'.
19-
Type 'T' is not assignable to type '"text"'.
20-
Type '"text" | "email"' is not assignable to type '"text"'.
21-
Type '"email"' is not assignable to type '"text"'.
12+
Type 'T' is not assignable to type 'T & "text"'.
13+
Type '"text" | "email"' is not assignable to type 'T & "text"'.
14+
Type '"text"' is not assignable to type 'T & "text"'.
15+
Type '"text"' is not assignable to type 'T'.
16+
'"text"' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint '"text" | "email"'.
17+
Type 'T' is not assignable to type '"text"'.
18+
Type '"text" | "email"' is not assignable to type '"text"'.
19+
Type '"email"' is not assignable to type '"text"'.
2220

2321

2422
==== tests/cases/compiler/complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.ts (1 errors) ====
@@ -67,16 +65,14 @@ tests/cases/compiler/complicatedIndexedAccessKeyofReliesOnKeyofNeverUpperBound.t
6765
!!! error TS2322: Type '"text" | "email"' is not assignable to type 'ChannelOfType<T, TextChannel>["type"]'.
6866
!!! error TS2322: Type '"text"' is not assignable to type 'ChannelOfType<T, TextChannel>["type"]'.
6967
!!! error TS2322: Type '"text"' is not assignable to type 'T & "text"'.
70-
!!! error TS2322: Type '"text"' is not assignable to type 'T'.
71-
!!! error TS2322: '"text"' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint '"text" | "email"'.
72-
!!! error TS2322: Type 'T' is not assignable to type 'T & "text"'.
73-
!!! error TS2322: Type '"text" | "email"' is not assignable to type 'T & "text"'.
74-
!!! error TS2322: Type '"text"' is not assignable to type 'T & "text"'.
75-
!!! error TS2322: Type '"text"' is not assignable to type 'T'.
76-
!!! error TS2322: '"text"' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint '"text" | "email"'.
77-
!!! error TS2322: Type 'T' is not assignable to type '"text"'.
78-
!!! error TS2322: Type '"text" | "email"' is not assignable to type '"text"'.
79-
!!! error TS2322: Type '"email"' is not assignable to type '"text"'.
68+
!!! error TS2322: Type 'T' is not assignable to type 'T & "text"'.
69+
!!! error TS2322: Type '"text" | "email"' is not assignable to type 'T & "text"'.
70+
!!! error TS2322: Type '"text"' is not assignable to type 'T & "text"'.
71+
!!! error TS2322: Type '"text"' is not assignable to type 'T'.
72+
!!! error TS2322: '"text"' is assignable to the constraint of type 'T', but 'T' could be instantiated with a different subtype of constraint '"text" | "email"'.
73+
!!! error TS2322: Type 'T' is not assignable to type '"text"'.
74+
!!! error TS2322: Type '"text" | "email"' is not assignable to type '"text"'.
75+
!!! error TS2322: Type '"email"' is not assignable to type '"text"'.
8076
}
8177

8278
const newTextChannel = makeNewChannel('text');

‎tests/baselines/reference/intersectionAndUnionTypes.errors.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(20,1): e
55
tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(23,1): error TS2322: Type 'A | B' is not assignable to type '(A & B) | (C & D)'.
66
Type 'A' is not assignable to type '(A & B) | (C & D)'.
77
Type 'A' is not assignable to type 'A & B'.
8-
Type 'A' is not assignable to type 'B'.
98
tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(25,1): error TS2322: Type 'C | D' is not assignable to type '(A & B) | (C & D)'.
109
Type 'C' is not assignable to type '(A & B) | (C & D)'.
1110
Type 'C' is not assignable to type 'C & D'.
@@ -80,7 +79,6 @@ tests/cases/conformance/types/intersection/intersectionAndUnionTypes.ts(37,1): e
8079
!!! error TS2322: Type 'A | B' is not assignable to type '(A & B) | (C & D)'.
8180
!!! error TS2322: Type 'A' is not assignable to type '(A & B) | (C & D)'.
8281
!!! error TS2322: Type 'A' is not assignable to type 'A & B'.
83-
!!! error TS2322: Type 'A' is not assignable to type 'B'.
8482
x = cnd; // Ok
8583
x = cod;
8684
~

‎tests/baselines/reference/keyofAndIndexedAccessErrors.errors.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,11 @@ tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(82,5): error
3333
Type 'string | number | symbol' is not assignable to type 'keyof U'.
3434
Type 'string' is not assignable to type 'keyof U'.
3535
tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(83,5): error TS2322: Type 'keyof T | keyof U' is not assignable to type 'keyof T & keyof U'.
36+
Type 'keyof T' is not assignable to type 'keyof T & keyof U'.
3637
tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(86,5): error TS2322: Type 'keyof T | keyof U' is not assignable to type 'keyof T & keyof U'.
38+
Type 'keyof T' is not assignable to type 'keyof T & keyof U'.
3739
tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(87,5): error TS2322: Type 'keyof T | keyof U' is not assignable to type 'keyof T & keyof U'.
40+
Type 'keyof T' is not assignable to type 'keyof T & keyof U'.
3841
tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(103,9): error TS2322: Type 'Extract<keyof T, string>' is not assignable to type 'K'.
3942
'Extract<keyof T, string>' is assignable to the constraint of type 'K', but 'K' could be instantiated with a different subtype of constraint 'string'.
4043
Type 'string & keyof T' is not assignable to type 'K'.
@@ -209,14 +212,17 @@ tests/cases/conformance/types/keyof/keyofAndIndexedAccessErrors.ts(142,5): error
209212
k1 = k4; // Error
210213
~~
211214
!!! error TS2322: Type 'keyof T | keyof U' is not assignable to type 'keyof T & keyof U'.
215+
!!! error TS2322: Type 'keyof T' is not assignable to type 'keyof T & keyof U'.
212216

213217
k2 = k1;
214218
k2 = k3; // Error
215219
~~
216220
!!! error TS2322: Type 'keyof T | keyof U' is not assignable to type 'keyof T & keyof U'.
221+
!!! error TS2322: Type 'keyof T' is not assignable to type 'keyof T & keyof U'.
217222
k2 = k4; // Error
218223
~~
219224
!!! error TS2322: Type 'keyof T | keyof U' is not assignable to type 'keyof T & keyof U'.
225+
!!! error TS2322: Type 'keyof T' is not assignable to type 'keyof T & keyof U'.
220226

221227
k3 = k1;
222228
k3 = k2;

‎tests/baselines/reference/unionTypeCallSignatures6.errors.txt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,12 @@ tests/cases/conformance/types/union/unionTypeCallSignatures6.ts(38,4): error TS2
66
tests/cases/conformance/types/union/unionTypeCallSignatures6.ts(39,1): error TS2684: The 'this' context of type 'A & C & { f0: F0 | F3; f1: F1 | F3; f2: F1 | F4; f3: F3 | F4; f4: F3 | F5; }' is not assignable to method's 'this' of type 'B'.
77
Property 'b' is missing in type 'A & C & { f0: F0 | F3; f1: F1 | F3; f2: F1 | F4; f3: F3 | F4; f4: F3 | F5; }' but required in type 'B'.
88
tests/cases/conformance/types/union/unionTypeCallSignatures6.ts(48,1): error TS2684: The 'this' context of type 'void' is not assignable to method's 'this' of type 'A & B'.
9-
Type 'void' is not assignable to type 'A'.
109
tests/cases/conformance/types/union/unionTypeCallSignatures6.ts(55,1): error TS2769: No overload matches this call.
1110
Overload 1 of 2, '(this: A & B & C): void', gave the following error.
1211
The 'this' context of type 'void' is not assignable to method's 'this' of type 'A & B & C'.
1312
Type 'void' is not assignable to type 'A'.
1413
Overload 2 of 2, '(this: A & B): void', gave the following error.
1514
The 'this' context of type 'void' is not assignable to method's 'this' of type 'A & B'.
16-
Type 'void' is not assignable to type 'A'.
1715

1816

1917
==== tests/cases/conformance/types/union/unionTypeCallSignatures6.ts (6 errors) ====
@@ -79,7 +77,6 @@ tests/cases/conformance/types/union/unionTypeCallSignatures6.ts(55,1): error TS2
7977
f3(); // error
8078
~~~~
8179
!!! error TS2684: The 'this' context of type 'void' is not assignable to method's 'this' of type 'A & B'.
82-
!!! error TS2684: Type 'void' is not assignable to type 'A'.
8380

8481
interface F7 {
8582
(this: A & B & C): void;
@@ -94,5 +91,4 @@ tests/cases/conformance/types/union/unionTypeCallSignatures6.ts(55,1): error TS2
9491
!!! error TS2769: Type 'void' is not assignable to type 'A'.
9592
!!! error TS2769: Overload 2 of 2, '(this: A & B): void', gave the following error.
9693
!!! error TS2769: The 'this' context of type 'void' is not assignable to method's 'this' of type 'A & B'.
97-
!!! error TS2769: Type 'void' is not assignable to type 'A'.
9894

0 commit comments

Comments
 (0)