Skip to content

Commit d581bed

Browse files
committed
Revert "Accept new baselines"
This reverts commit 33bc9d1.
1 parent cf17be2 commit d581bed

File tree

4 files changed

+24
-26
lines changed

4 files changed

+24
-26
lines changed

tests/baselines/reference/arrayOfSubtypeIsAssignableToReadonlyArray.errors.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ tests/cases/compiler/arrayOfSubtypeIsAssignableToReadonlyArray.ts(13,1): error T
33
Type '{ (...items: A[][]): A[]; (...items: (A | A[])[]): A[]; }' is not assignable to type '{ <U extends ReadonlyArray<B>>(...items: U[]): B[]; (...items: B[][]): B[]; (...items: (B | B[])[]): B[]; }'.
44
Type 'A[]' is not assignable to type 'B[]'.
55
Type 'A' is not assignable to type 'B'.
6-
Property 'b' is missing in type 'A'.
76
tests/cases/compiler/arrayOfSubtypeIsAssignableToReadonlyArray.ts(18,1): error TS2322: Type 'C<A>' is not assignable to type 'ReadonlyArray<B>'.
87
Types of property 'concat' are incompatible.
98
Type '{ (...items: A[][]): A[]; (...items: (A | A[])[]): A[]; }' is not assignable to type '{ <U extends ReadonlyArray<B>>(...items: U[]): B[]; (...items: B[][]): B[]; (...items: (B | B[])[]): B[]; }'.
@@ -30,7 +29,6 @@ tests/cases/compiler/arrayOfSubtypeIsAssignableToReadonlyArray.ts(18,1): error T
3029
!!! error TS2322: Type '{ (...items: A[][]): A[]; (...items: (A | A[])[]): A[]; }' is not assignable to type '{ <U extends ReadonlyArray<B>>(...items: U[]): B[]; (...items: B[][]): B[]; (...items: (B | B[])[]): B[]; }'.
3130
!!! error TS2322: Type 'A[]' is not assignable to type 'B[]'.
3231
!!! error TS2322: Type 'A' is not assignable to type 'B'.
33-
!!! error TS2322: Property 'b' is missing in type 'A'.
3432

3533
rra = cra;
3634
rra = crb; // OK, C<B> is assignable to ReadonlyArray<A>

tests/baselines/reference/subtypingWithCallSignatures2.types

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -470,14 +470,14 @@ var r5 = foo5(r5arg1); // any
470470
>r5arg1 : <T, U>(x: (arg: T) => U) => T
471471

472472
var r5a = [r5arg1, r5arg2];
473-
>r5a : (<T, U>(x: (arg: T) => U) => T)[]
474-
>[r5arg1, r5arg2] : (<T, U>(x: (arg: T) => U) => T)[]
473+
>r5a : ((<T, U>(x: (arg: T) => U) => T) | ((x: (arg: string) => number) => string))[]
474+
>[r5arg1, r5arg2] : ((<T, U>(x: (arg: T) => U) => T) | ((x: (arg: string) => number) => string))[]
475475
>r5arg1 : <T, U>(x: (arg: T) => U) => T
476476
>r5arg2 : (x: (arg: string) => number) => string
477477

478478
var r5b = [r5arg2, r5arg1];
479-
>r5b : (<T, U>(x: (arg: T) => U) => T)[]
480-
>[r5arg2, r5arg1] : (<T, U>(x: (arg: T) => U) => T)[]
479+
>r5b : ((<T, U>(x: (arg: T) => U) => T) | ((x: (arg: string) => number) => string))[]
480+
>[r5arg2, r5arg1] : ((<T, U>(x: (arg: T) => U) => T) | ((x: (arg: string) => number) => string))[]
481481
>r5arg2 : (x: (arg: string) => number) => string
482482
>r5arg1 : <T, U>(x: (arg: T) => U) => T
483483

@@ -514,14 +514,14 @@ var r6 = foo6(r6arg1); // any
514514
>r6arg1 : <T extends Base, U extends Derived>(x: (arg: T) => U) => T
515515

516516
var r6a = [r6arg1, r6arg2];
517-
>r6a : (<T extends Base, U extends Derived>(x: (arg: T) => U) => T)[]
518-
>[r6arg1, r6arg2] : (<T extends Base, U extends Derived>(x: (arg: T) => U) => T)[]
517+
>r6a : ((<T extends Base, U extends Derived>(x: (arg: T) => U) => T) | ((x: (arg: Base) => Derived) => Base))[]
518+
>[r6arg1, r6arg2] : ((<T extends Base, U extends Derived>(x: (arg: T) => U) => T) | ((x: (arg: Base) => Derived) => Base))[]
519519
>r6arg1 : <T extends Base, U extends Derived>(x: (arg: T) => U) => T
520520
>r6arg2 : (x: (arg: Base) => Derived) => Base
521521

522522
var r6b = [r6arg2, r6arg1];
523-
>r6b : (<T extends Base, U extends Derived>(x: (arg: T) => U) => T)[]
524-
>[r6arg2, r6arg1] : (<T extends Base, U extends Derived>(x: (arg: T) => U) => T)[]
523+
>r6b : ((<T extends Base, U extends Derived>(x: (arg: T) => U) => T) | ((x: (arg: Base) => Derived) => Base))[]
524+
>[r6arg2, r6arg1] : ((<T extends Base, U extends Derived>(x: (arg: T) => U) => T) | ((x: (arg: Base) => Derived) => Base))[]
525525
>r6arg2 : (x: (arg: Base) => Derived) => Base
526526
>r6arg1 : <T extends Base, U extends Derived>(x: (arg: T) => U) => T
527527

@@ -564,14 +564,14 @@ var r7 = foo7(r7arg1); // any
564564
>r7arg1 : <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U
565565

566566
var r7a = [r7arg1, r7arg2];
567-
>r7a : (<T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U)[]
568-
>[r7arg1, r7arg2] : (<T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U)[]
567+
>r7a : ((<T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U) | ((x: (arg: Base) => Derived) => (r: Base) => Derived))[]
568+
>[r7arg1, r7arg2] : ((<T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U) | ((x: (arg: Base) => Derived) => (r: Base) => Derived))[]
569569
>r7arg1 : <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U
570570
>r7arg2 : (x: (arg: Base) => Derived) => (r: Base) => Derived
571571

572572
var r7b = [r7arg2, r7arg1];
573-
>r7b : (<T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U)[]
574-
>[r7arg2, r7arg1] : (<T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U)[]
573+
>r7b : ((<T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U) | ((x: (arg: Base) => Derived) => (r: Base) => Derived))[]
574+
>[r7arg2, r7arg1] : ((<T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U) | ((x: (arg: Base) => Derived) => (r: Base) => Derived))[]
575575
>r7arg2 : (x: (arg: Base) => Derived) => (r: Base) => Derived
576576
>r7arg1 : <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U
577577

@@ -622,14 +622,14 @@ var r8 = foo8(r8arg1); // any
622622
>r8arg1 : <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U
623623

624624
var r8a = [r8arg1, r8arg2];
625-
>r8a : (<T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U)[]
626-
>[r8arg1, r8arg2] : (<T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U)[]
625+
>r8a : ((<T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U) | ((x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived))[]
626+
>[r8arg1, r8arg2] : ((<T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U) | ((x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived))[]
627627
>r8arg1 : <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U
628628
>r8arg2 : (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
629629

630630
var r8b = [r8arg2, r8arg1];
631-
>r8b : (<T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U)[]
632-
>[r8arg2, r8arg1] : (<T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U)[]
631+
>r8b : ((<T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U) | ((x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived))[]
632+
>[r8arg2, r8arg1] : ((<T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U) | ((x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived))[]
633633
>r8arg2 : (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
634634
>r8arg1 : <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U
635635

tests/baselines/reference/subtypingWithCallSignatures3.types

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -291,14 +291,14 @@ module Errors {
291291
>r2arg : <T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V
292292

293293
var r2a = [r2arg2, r2arg];
294-
>r2a : (<T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V)[]
295-
>[r2arg2, r2arg] : (<T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V)[]
294+
>r2a : ((<T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V) | ((x: (arg: Base) => Derived) => (r: Base) => Derived2))[]
295+
>[r2arg2, r2arg] : ((<T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V) | ((x: (arg: Base) => Derived) => (r: Base) => Derived2))[]
296296
>r2arg2 : (x: (arg: Base) => Derived) => (r: Base) => Derived2
297297
>r2arg : <T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V
298298

299299
var r2b = [r2arg, r2arg2];
300-
>r2b : (<T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V)[]
301-
>[r2arg, r2arg2] : (<T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V)[]
300+
>r2b : ((<T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V) | ((x: (arg: Base) => Derived) => (r: Base) => Derived2))[]
301+
>[r2arg, r2arg2] : ((<T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V) | ((x: (arg: Base) => Derived) => (r: Base) => Derived2))[]
302302
>r2arg : <T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V
303303
>r2arg2 : (x: (arg: Base) => Derived) => (r: Base) => Derived2
304304

tests/baselines/reference/subtypingWithCallSignatures4.types

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -447,14 +447,14 @@ var r6 = foo6(r6arg);
447447
>r6arg : <T extends Base, U extends Derived>(x: (arg: T) => U) => T
448448

449449
var r6a = [r6arg, r6arg2];
450-
>r6a : (<T extends Base, U extends Derived>(x: (arg: T) => U) => T)[]
451-
>[r6arg, r6arg2] : (<T extends Base, U extends Derived>(x: (arg: T) => U) => T)[]
450+
>r6a : (<T extends Base>(x: (arg: T) => Derived) => T)[]
451+
>[r6arg, r6arg2] : (<T extends Base>(x: (arg: T) => Derived) => T)[]
452452
>r6arg : <T extends Base, U extends Derived>(x: (arg: T) => U) => T
453453
>r6arg2 : <T extends Base>(x: (arg: T) => Derived) => T
454454

455455
var r6b = [r6arg2, r6arg];
456-
>r6b : (<T extends Base, U extends Derived>(x: (arg: T) => U) => T)[]
457-
>[r6arg2, r6arg] : (<T extends Base, U extends Derived>(x: (arg: T) => U) => T)[]
456+
>r6b : (<T extends Base>(x: (arg: T) => Derived) => T)[]
457+
>[r6arg2, r6arg] : (<T extends Base>(x: (arg: T) => Derived) => T)[]
458458
>r6arg2 : <T extends Base>(x: (arg: T) => Derived) => T
459459
>r6arg : <T extends Base, U extends Derived>(x: (arg: T) => U) => T
460460

0 commit comments

Comments
 (0)