From b20d631ba235ae176d12fe95006535b637357e01 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Wed, 13 Sep 2017 11:52:51 -0700 Subject: [PATCH] Accept new baselines --- tests/baselines/reference/restUnion2.js | 2 +- tests/baselines/reference/restUnion2.symbols | 2 +- tests/baselines/reference/restUnion2.types | 7 +++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/baselines/reference/restUnion2.js b/tests/baselines/reference/restUnion2.js index 71f4b06cfef..382b7bb2bc9 100644 --- a/tests/baselines/reference/restUnion2.js +++ b/tests/baselines/reference/restUnion2.js @@ -13,7 +13,7 @@ declare const nullAndUndefinedUnion: null | undefined; var rest4: { }; var {...rest4 } = nullAndUndefinedUnion; -declare const unionWithIntersection: ({ n: number } & { s: string }) & undefined | null; +declare const unionWithIntersection: ({ n: number } & { s: string }) & undefined; var rest5: { n: number, s: string }; var {...rest5 } = unionWithIntersection; diff --git a/tests/baselines/reference/restUnion2.symbols b/tests/baselines/reference/restUnion2.symbols index 54ac47f0694..2728285f5ef 100644 --- a/tests/baselines/reference/restUnion2.symbols +++ b/tests/baselines/reference/restUnion2.symbols @@ -35,7 +35,7 @@ var {...rest4 } = nullAndUndefinedUnion; >rest4 : Symbol(rest4, Decl(restUnion2.ts, 11, 3), Decl(restUnion2.ts, 12, 5)) >nullAndUndefinedUnion : Symbol(nullAndUndefinedUnion, Decl(restUnion2.ts, 10, 13)) -declare const unionWithIntersection: ({ n: number } & { s: string }) & undefined | null; +declare const unionWithIntersection: ({ n: number } & { s: string }) & undefined; >unionWithIntersection : Symbol(unionWithIntersection, Decl(restUnion2.ts, 14, 13)) >n : Symbol(n, Decl(restUnion2.ts, 14, 39)) >s : Symbol(s, Decl(restUnion2.ts, 14, 55)) diff --git a/tests/baselines/reference/restUnion2.types b/tests/baselines/reference/restUnion2.types index 03c8d577e66..029192a9ac4 100644 --- a/tests/baselines/reference/restUnion2.types +++ b/tests/baselines/reference/restUnion2.types @@ -37,11 +37,10 @@ var {...rest4 } = nullAndUndefinedUnion; >rest4 : {} >nullAndUndefinedUnion : null | undefined -declare const unionWithIntersection: ({ n: number } & { s: string }) & undefined | null; ->unionWithIntersection : ({ n: number; } & { s: string; } & undefined) | null +declare const unionWithIntersection: ({ n: number } & { s: string }) & undefined; +>unionWithIntersection : { n: number; } & { s: string; } & undefined >n : number >s : string ->null : null var rest5: { n: number, s: string }; >rest5 : { n: number; s: string; } @@ -50,5 +49,5 @@ var rest5: { n: number, s: string }; var {...rest5 } = unionWithIntersection; >rest5 : { n: number; s: string; } ->unionWithIntersection : ({ n: number; } & { s: string; } & undefined) | null +>unionWithIntersection : { n: number; } & { s: string; } & undefined