Skip to content

Commit b6e66c2

Browse files
committed
Accept new baselines
1 parent 5510e07 commit b6e66c2

File tree

3 files changed

+10
-18
lines changed

3 files changed

+10
-18
lines changed

tests/baselines/reference/jsxChildrenGenericContextualTypes.errors.txt

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
tests/cases/compiler/jsxChildrenGenericContextualTypes.tsx(20,46): error TS2322: Type '"y"' is not assignable to type '"x"'.
2-
tests/cases/compiler/jsxChildrenGenericContextualTypes.tsx(21,19): error TS2322: Type '{ children: (p: LitProps<"x">) => "y"; prop: "x"; }' is not assignable to type 'IntrinsicAttributes & LitProps<"x" | "y">'.
3-
Type '{ children: (p: LitProps<"x">) => "y"; prop: "x"; }' is not assignable to type 'LitProps<"x" | "y">'.
2+
tests/cases/compiler/jsxChildrenGenericContextualTypes.tsx(21,19): error TS2322: Type '{ children: (p: LitProps<"x">) => "y"; prop: "x"; }' is not assignable to type 'IntrinsicAttributes & LitProps<"x">'.
3+
Type '{ children: (p: LitProps<"x">) => "y"; prop: "x"; }' is not assignable to type 'LitProps<"x">'.
44
Types of property 'children' are incompatible.
5-
Type '(p: LitProps<"x">) => "y"' is not assignable to type '(x: LitProps<"x" | "y">) => "x" | "y"'.
6-
Types of parameters 'p' and 'x' are incompatible.
7-
Type 'LitProps<"x" | "y">' is not assignable to type 'LitProps<"x">'.
8-
Types of property 'prop' are incompatible.
9-
Type '"x" | "y"' is not assignable to type '"x"'.
10-
Type '"y"' is not assignable to type '"x"'.
5+
Type '(p: LitProps<"x">) => "y"' is not assignable to type '(x: LitProps<"x">) => "x"'.
6+
Type '"y"' is not assignable to type '"x"'.
117
tests/cases/compiler/jsxChildrenGenericContextualTypes.tsx(22,21): error TS2322: Type '{ children: () => number; prop: "x"; }' is not assignable to type 'IntrinsicAttributes & LitProps<"x">'.
128
Type '{ children: () => number; prop: "x"; }' is not assignable to type 'LitProps<"x">'.
139
Types of property 'children' are incompatible.
@@ -41,15 +37,11 @@ tests/cases/compiler/jsxChildrenGenericContextualTypes.tsx(22,21): error TS2322:
4137
!!! related TS6502 tests/cases/compiler/jsxChildrenGenericContextualTypes.tsx:13:44: The expected type comes from the return type of this signature.
4238
const argchild = <ElemLit prop="x">{p => "y"}</ElemLit>
4339
~~~~~~~
44-
!!! error TS2322: Type '{ children: (p: LitProps<"x">) => "y"; prop: "x"; }' is not assignable to type 'IntrinsicAttributes & LitProps<"x" | "y">'.
45-
!!! error TS2322: Type '{ children: (p: LitProps<"x">) => "y"; prop: "x"; }' is not assignable to type 'LitProps<"x" | "y">'.
40+
!!! error TS2322: Type '{ children: (p: LitProps<"x">) => "y"; prop: "x"; }' is not assignable to type 'IntrinsicAttributes & LitProps<"x">'.
41+
!!! error TS2322: Type '{ children: (p: LitProps<"x">) => "y"; prop: "x"; }' is not assignable to type 'LitProps<"x">'.
4642
!!! error TS2322: Types of property 'children' are incompatible.
47-
!!! error TS2322: Type '(p: LitProps<"x">) => "y"' is not assignable to type '(x: LitProps<"x" | "y">) => "x" | "y"'.
48-
!!! error TS2322: Types of parameters 'p' and 'x' are incompatible.
49-
!!! error TS2322: Type 'LitProps<"x" | "y">' is not assignable to type 'LitProps<"x">'.
50-
!!! error TS2322: Types of property 'prop' are incompatible.
51-
!!! error TS2322: Type '"x" | "y"' is not assignable to type '"x"'.
52-
!!! error TS2322: Type '"y"' is not assignable to type '"x"'.
43+
!!! error TS2322: Type '(p: LitProps<"x">) => "y"' is not assignable to type '(x: LitProps<"x">) => "x"'.
44+
!!! error TS2322: Type '"y"' is not assignable to type '"x"'.
5345
const mismatched = <ElemLit prop="x">{() => 12}</ElemLit>
5446
~~~~~~~
5547
!!! error TS2322: Type '{ children: () => number; prop: "x"; }' is not assignable to type 'IntrinsicAttributes & LitProps<"x">'.

tests/baselines/reference/promiseTypeInference.errors.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ tests/cases/compiler/promiseTypeInference.ts(10,39): error TS2322: Type 'IPromis
2626
!!! error TS2322: Types of parameters 'success' and 'onfulfilled' are incompatible.
2727
!!! error TS2322: Type 'TResult1 | PromiseLike<TResult1>' is not assignable to type 'IPromise<TResult1 | TResult2>'.
2828
!!! error TS2322: Type 'TResult1' is not assignable to type 'IPromise<TResult1 | TResult2>'.
29-
!!! related TS6502 /.ts/lib.es5.d.ts:1336:57: The expected type comes from the return type of this signature.
29+
!!! related TS6502 /.ts/lib.es5.d.ts:1396:57: The expected type comes from the return type of this signature.
3030

tests/baselines/reference/wrappedAndRecursiveConstraints4.errors.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ tests/cases/conformance/types/typeParameters/typeArgumentLists/wrappedAndRecursi
1818
var r2 = r({ length: 3, charAt: (x: number) => { '' } }); // error
1919
~~~~~~
2020
!!! error TS2322: Type '(x: number) => void' is not assignable to type '(pos: number) => string'.
21-
!!! error TS2322: Type 'void' is not assignable to type 'string'.
21+
!!! error TS2322: Type 'void' is not assignable to type 'string'.

0 commit comments

Comments
 (0)