mirror of
https://github.com/microsoft/TypeScript.git
synced 2026-02-09 02:30:15 -06:00
Merge branch 'master' into builderApi
This commit is contained in:
commit
66500293cb
@ -14,7 +14,7 @@ type Diff<T extends string, U extends string> =
|
||||
>T : T
|
||||
|
||||
type Omit<U, K extends keyof U> = Pick<U, Diff<keyof U, K>>
|
||||
>Omit : Pick<U, ({ [P in T]: P; } & { [P in U]: never; } & { [x: string]: never; })[keyof U]>
|
||||
>Omit : Pick<U, ({ [P in keyof U]: P; } & { [P in K]: never; } & { [x: string]: never; })[keyof U]>
|
||||
>U : U
|
||||
>K : K
|
||||
>U : U
|
||||
@ -25,7 +25,7 @@ type Omit<U, K extends keyof U> = Pick<U, Diff<keyof U, K>>
|
||||
>K : K
|
||||
|
||||
type Omit1<U, K extends keyof U> = Pick<U, Diff<keyof U, K>>;
|
||||
>Omit1 : Pick<U, ({ [P in T]: P; } & { [P in U]: never; } & { [x: string]: never; })[keyof U]>
|
||||
>Omit1 : Pick<U, ({ [P in keyof U]: P; } & { [P in K]: never; } & { [x: string]: never; })[keyof U]>
|
||||
>U : U
|
||||
>K : K
|
||||
>U : U
|
||||
@ -51,7 +51,7 @@ type Omit2<T, K extends keyof T> = {[P in Diff<keyof T, K>]: T[P]};
|
||||
|
||||
type O = Omit<{ a: number, b: string }, 'a'>
|
||||
>O : Pick<{ a: number; b: string; }, "b">
|
||||
>Omit : Pick<U, ({ [P in T]: P; } & { [P in U]: never; } & { [x: string]: never; })[keyof U]>
|
||||
>Omit : Pick<U, ({ [P in keyof U]: P; } & { [P in K]: never; } & { [x: string]: never; })[keyof U]>
|
||||
>a : number
|
||||
>b : string
|
||||
|
||||
|
||||
@ -1 +1 @@
|
||||
Subproject commit ed149eb0c787b1195a95b44105822c64bb6eb636
|
||||
Subproject commit 40bdb4eadabc9fbed7d83e3f26817a931c0763b6
|
||||
Loading…
x
Reference in New Issue
Block a user