Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Accepting new baselines

Browse Source
This commit is contained in:
Anders Hejlsberg
2016-04-10 09:31:02 -07:00
parent b1e9f43d28
commit 4c250d046f
2 changed files with 17 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/baselines/reference/equalityWithUnionTypes01.types
+8 -8
View File
@@ -35,36 +35,36 @@ var z: I1 = x;
if (y === z || z === y) {
>y === z || z === y : boolean
>y === z : boolean
>y : number | I2
>y : I2
>z : I1
>z === y : boolean
>z : I1
>y : number | I2
>y : I2
}
else if (y !== z || z !== y) {
>y !== z || z !== y : boolean
>y !== z : boolean
>y : number | I2
>y : I2
>z : I1
>z !== y : boolean
>z : I1
>y : number | I2
>y : I2
}
else if (y == z || z == y) {
>y == z || z == y : boolean
>y == z : boolean
>y : number | I2
>y : I2
>z : I1
>z == y : boolean
>z : I1
>y : number | I2
>y : I2
}
else if (y != z || z != y) {
>y != z || z != y : boolean
>y != z : boolean
>y : number | I2
>y : I2
>z : I1
>z != y : boolean
>z : I1
>y : number | I2
>y : I2
}
tests/baselines/reference/typeAssertions.errors.txt
+9 -31
View File
@@ -1,24 +1,14 @@
tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(5,5): error TS2346: Supplied parameters do not match any signature of call target.
<<<<<<< HEAD
tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(31,12): error TS2352: Neither type 'SomeOther' nor type 'SomeBase' is assignable to the other.
tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(31,12): error TS2352: Neither type 'SomeOther' nor type 'SomeBase' is assignable to the other.
Property 'p' is missing in type 'SomeOther'.
tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(35,15): error TS2352: Neither type 'SomeOther' nor type 'SomeDerived' is assignable to the other.
tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(35,15): error TS2352: Neither type 'SomeOther' nor type 'SomeDerived' is assignable to the other.
=======
tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(31,12): error TS2352: Type 'SomeOther' cannot be converted to type 'SomeBase'.
tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(31,12): error TS2352: Type 'SomeOther' cannot be converted to type 'SomeBase'.
Property 'p' is missing in type 'SomeOther'.
tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(35,15): error TS2352: Type 'SomeOther' cannot be converted to type 'SomeDerived'.
>>>>>>> master
tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(35,15): error TS2352: Type 'SomeOther' cannot be converted to type 'SomeDerived'.
Property 'x' is missing in type 'SomeOther'.
tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(37,13): error TS2352: Type 'SomeDerived' cannot be converted to type 'SomeOther'.
Property 'q' is missing in type 'SomeDerived'.
<<<<<<< HEAD
tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(38,13): error TS2352: Neither type 'SomeBase' nor type 'SomeOther' is assignable to the other.
tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(38,13): error TS2352: Neither type 'SomeBase' nor type 'SomeOther' is assignable to the other.
=======
tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(38,13): error TS2352: Type 'SomeBase' cannot be converted to type 'SomeOther'.
>>>>>>> master
tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(38,13): error TS2352: Type 'SomeBase' cannot be converted to type 'SomeOther'.
Property 'q' is missing in type 'SomeBase'.
tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(44,5): error TS2304: Cannot find name 'numOrStr'.
tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(44,14): error TS1005: '>' expected.
@@ -71,26 +61,18 @@ tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(48,50): err
someBase = <SomeBase>someBase;
someBase = <SomeBase>someOther; // Error
~~~~~~~~~~~~~~~~~~~
<<<<<<< HEAD
!!! error TS2352: Neither type 'SomeOther' nor type 'SomeBase' is assignable to the other.
~~~~~~~~~~~~~~~~~~~
!!! error TS2352: Neither type 'SomeOther' nor type 'SomeBase' is assignable to the other.
=======
!!! error TS2352: Type 'SomeOther' cannot be converted to type 'SomeBase'.
>>>>>>> master
~~~~~~~~~~~~~~~~~~~
!!! error TS2352: Type 'SomeOther' cannot be converted to type 'SomeBase'.
!!! error TS2352: Property 'p' is missing in type 'SomeOther'.
someDerived = <SomeDerived>someDerived;
someDerived = <SomeDerived>someBase;
someDerived = <SomeDerived>someOther; // Error
~~~~~~~~~~~~~~~~~~~~~~
<<<<<<< HEAD
!!! error TS2352: Neither type 'SomeOther' nor type 'SomeDerived' is assignable to the other.
~~~~~~~~~~~~~~~~~~~~~~
!!! error TS2352: Neither type 'SomeOther' nor type 'SomeDerived' is assignable to the other.
=======
!!! error TS2352: Type 'SomeOther' cannot be converted to type 'SomeDerived'.
>>>>>>> master
~~~~~~~~~~~~~~~~~~~~~~
!!! error TS2352: Type 'SomeOther' cannot be converted to type 'SomeDerived'.
!!! error TS2352: Property 'x' is missing in type 'SomeOther'.
someOther = <SomeOther>someDerived; // Error
@@ -99,13 +81,9 @@ tests/cases/conformance/expressions/typeAssertions/typeAssertions.ts(48,50): err
!!! error TS2352: Property 'q' is missing in type 'SomeDerived'.
someOther = <SomeOther>someBase; // Error
~~~~~~~~~~~~~~~~~~~
<<<<<<< HEAD
!!! error TS2352: Neither type 'SomeBase' nor type 'SomeOther' is assignable to the other.
~~~~~~~~~~~~~~~~~~~
!!! error TS2352: Neither type 'SomeBase' nor type 'SomeOther' is assignable to the other.
=======
!!! error TS2352: Type 'SomeBase' cannot be converted to type 'SomeOther'.
>>>>>>> master
~~~~~~~~~~~~~~~~~~~
!!! error TS2352: Type 'SomeBase' cannot be converted to type 'SomeOther'.
!!! error TS2352: Property 'q' is missing in type 'SomeBase'.
someOther = <SomeOther>someOther;