From c0e802deb5e83232d05978aa0995771641a034ef Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Sat, 16 Aug 2014 11:15:31 -0700 Subject: [PATCH] Accepting new baselines after merge. --- tests/baselines/reference/tupleTypes.errors.txt | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/baselines/reference/tupleTypes.errors.txt b/tests/baselines/reference/tupleTypes.errors.txt index 69c6a9073ab..44cb22daf0f 100644 --- a/tests/baselines/reference/tupleTypes.errors.txt +++ b/tests/baselines/reference/tupleTypes.errors.txt @@ -62,18 +62,16 @@ a = a1; // Error ~ !!! Type '[number, string]' is not assignable to type 'number[]': -!!! Types of property 'concat' are incompatible: -!!! Type '{ (...items: U[]): {}[]; (...items: {}[]): {}[]; }' is not assignable to type '{ (...items: U[]): number[]; (...items: number[]): number[]; }': -!!! Type '{}[]' is not assignable to type 'number[]': -!!! Type '{}' is not assignable to type 'number'. +!!! Types of property 'pop' are incompatible: +!!! Type '() => {}' is not assignable to type '() => number': +!!! Type '{}' is not assignable to type 'number'. a = a2; a = a3; // Error ~ !!! Type '[number, {}]' is not assignable to type 'number[]': -!!! Types of property 'concat' are incompatible: -!!! Type '{ (...items: U[]): {}[]; (...items: {}[]): {}[]; }' is not assignable to type '{ (...items: U[]): number[]; (...items: number[]): number[]; }': -!!! Type '{}[]' is not assignable to type 'number[]': -!!! Type '{}' is not assignable to type 'number'. +!!! Types of property 'pop' are incompatible: +!!! Type '() => {}' is not assignable to type '() => number': +!!! Type '{}' is not assignable to type 'number'. a1 = a2; // Error ~~ !!! Type '[number, number]' is not assignable to type '[number, string]':