From de837ed51f8f6f329cee97932bf3a8e7ea4cc46e Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Wed, 17 Jul 2019 15:07:36 -0700 Subject: [PATCH] Accept new baselines --- .../reference/unionTypeInference.errors.txt | 10 +++++----- tests/baselines/reference/unionTypeInference.js | 6 +++--- .../reference/unionTypeInference.symbols | 16 ++++++++-------- .../baselines/reference/unionTypeInference.types | 8 ++++---- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/tests/baselines/reference/unionTypeInference.errors.txt b/tests/baselines/reference/unionTypeInference.errors.txt index 6993f4280a7..2fe480d0a07 100644 --- a/tests/baselines/reference/unionTypeInference.errors.txt +++ b/tests/baselines/reference/unionTypeInference.errors.txt @@ -1,5 +1,5 @@ tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference.ts(13,24): error TS2345: Argument of type '1' is not assignable to parameter of type 'string'. -tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference.ts(31,13): error TS2345: Argument of type '42' is not assignable to parameter of type 'never'. +tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference.ts(31,15): error TS2345: Argument of type '42' is not assignable to parameter of type 'never'. ==== tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference.ts (2 errors) ==== @@ -33,10 +33,10 @@ tests/cases/conformance/types/typeRelationships/typeInference/unionTypeInference declare function f4(x: string & T): T; - var d1 = f4("abc"); - var d2 = f4(s); - var d3 = f4(42); // Error - ~~ + const d1 = f4("abc"); + const d2 = f4(s); + const d3 = f4(42); // Error + ~~ !!! error TS2345: Argument of type '42' is not assignable to parameter of type 'never'. // Repros from #32434 diff --git a/tests/baselines/reference/unionTypeInference.js b/tests/baselines/reference/unionTypeInference.js index fb94e1910f1..868140e83a0 100644 --- a/tests/baselines/reference/unionTypeInference.js +++ b/tests/baselines/reference/unionTypeInference.js @@ -27,9 +27,9 @@ const c5 = f3("abc"); // never declare function f4(x: string & T): T; -var d1 = f4("abc"); -var d2 = f4(s); -var d3 = f4(42); // Error +const d1 = f4("abc"); +const d2 = f4(s); +const d3 = f4(42); // Error // Repros from #32434 diff --git a/tests/baselines/reference/unionTypeInference.symbols b/tests/baselines/reference/unionTypeInference.symbols index a34be279837..52b8809dee6 100644 --- a/tests/baselines/reference/unionTypeInference.symbols +++ b/tests/baselines/reference/unionTypeInference.symbols @@ -94,23 +94,23 @@ declare function f4(x: string & T): T; >T : Symbol(T, Decl(unionTypeInference.ts, 26, 20)) >T : Symbol(T, Decl(unionTypeInference.ts, 26, 20)) -var d1 = f4("abc"); ->d1 : Symbol(d1, Decl(unionTypeInference.ts, 28, 3)) +const d1 = f4("abc"); +>d1 : Symbol(d1, Decl(unionTypeInference.ts, 28, 5)) >f4 : Symbol(f4, Decl(unionTypeInference.ts, 24, 21)) -var d2 = f4(s); ->d2 : Symbol(d2, Decl(unionTypeInference.ts, 29, 3)) +const d2 = f4(s); +>d2 : Symbol(d2, Decl(unionTypeInference.ts, 29, 5)) >f4 : Symbol(f4, Decl(unionTypeInference.ts, 24, 21)) >s : Symbol(s, Decl(unionTypeInference.ts, 1, 13)) -var d3 = f4(42); // Error ->d3 : Symbol(d3, Decl(unionTypeInference.ts, 30, 3)) +const d3 = f4(42); // Error +>d3 : Symbol(d3, Decl(unionTypeInference.ts, 30, 5)) >f4 : Symbol(f4, Decl(unionTypeInference.ts, 24, 21)) // Repros from #32434 declare function foo(x: T | Promise): void; ->foo : Symbol(foo, Decl(unionTypeInference.ts, 30, 16)) +>foo : Symbol(foo, Decl(unionTypeInference.ts, 30, 18)) >T : Symbol(T, Decl(unionTypeInference.ts, 34, 21)) >x : Symbol(x, Decl(unionTypeInference.ts, 34, 24)) >T : Symbol(T, Decl(unionTypeInference.ts, 34, 21)) @@ -122,7 +122,7 @@ declare let x: false | Promise; >Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --)) foo(x); ->foo : Symbol(foo, Decl(unionTypeInference.ts, 30, 16)) +>foo : Symbol(foo, Decl(unionTypeInference.ts, 30, 18)) >x : Symbol(x, Decl(unionTypeInference.ts, 35, 11)) declare function bar(x: T, y: string | T): T; diff --git a/tests/baselines/reference/unionTypeInference.types b/tests/baselines/reference/unionTypeInference.types index 836c298bdbc..e6d47fa4bda 100644 --- a/tests/baselines/reference/unionTypeInference.types +++ b/tests/baselines/reference/unionTypeInference.types @@ -113,19 +113,19 @@ declare function f4(x: string & T): T; >f4 : (x: string & T) => T >x : string & T -var d1 = f4("abc"); ->d1 : string +const d1 = f4("abc"); +>d1 : "abc" >f4("abc") : "abc" >f4 : (x: string & T) => T >"abc" : "abc" -var d2 = f4(s); +const d2 = f4(s); >d2 : unknown >f4(s) : unknown >f4 : (x: string & T) => T >s : string -var d3 = f4(42); // Error +const d3 = f4(42); // Error >d3 : any >f4(42) : any >f4 : (x: string & T) => T