Accepting new baselines after merge

ahejlsberg · ahejlsberg · commit f6bcf7074caa · 2015-06-16T12:07:49.000-07:00
diff --git a/tests/baselines/reference/genericTypeConstraints.errors.txt b/tests/baselines/reference/genericTypeConstraints.errors.txt
@@ -1,9 +1,8 @@
-tests/cases/compiler/genericTypeConstraints.ts(9,27): error TS2344: Type 'FooExtended' does not satisfy the constraint 'Foo'.
-  Property 'fooMethod' is missing in type 'FooExtended'.
 tests/cases/compiler/genericTypeConstraints.ts(9,31): error TS2344: Type 'FooExtended' does not satisfy the constraint 'Foo'.
+  Property 'fooMethod' is missing in type 'FooExtended'.
 
 
-==== tests/cases/compiler/genericTypeConstraints.ts (2 errors) ====
+==== tests/cases/compiler/genericTypeConstraints.ts (1 errors) ====
     class Foo {
         fooMethod() {}
     }
@@ -13,11 +12,9 @@ tests/cases/compiler/genericTypeConstraints.ts(9,31): error TS2344: Type 'FooExt
     class Bar<T extends Foo> { }
     
     class BarExtended extends Bar<FooExtended> {
-                              ~~~~~~~~~~~~~~~~
-!!! error TS2344: Type 'FooExtended' does not satisfy the constraint 'Foo'.
-!!! error TS2344:   Property 'fooMethod' is missing in type 'FooExtended'.
                                   ~~~~~~~~~~~
 !!! error TS2344: Type 'FooExtended' does not satisfy the constraint 'Foo'.
+!!! error TS2344:   Property 'fooMethod' is missing in type 'FooExtended'.
         constructor() {
             super();
         }
diff --git a/tests/baselines/reference/strictModeReservedWordInClassDeclaration.errors.txt b/tests/baselines/reference/strictModeReservedWordInClassDeclaration.errors.txt
@@ -21,10 +21,11 @@ tests/cases/compiler/strictModeReservedWordInClassDeclaration.ts(26,21): error T
 tests/cases/compiler/strictModeReservedWordInClassDeclaration.ts(26,21): error TS2503: Cannot find namespace 'public'.
 tests/cases/compiler/strictModeReservedWordInClassDeclaration.ts(27,17): error TS1213: Identifier expected. 'package' is a reserved word in strict mode. Class definitions are automatically in strict mode.
 tests/cases/compiler/strictModeReservedWordInClassDeclaration.ts(27,17): error TS2304: Cannot find name 'package'.
+tests/cases/compiler/strictModeReservedWordInClassDeclaration.ts(28,17): error TS1213: Identifier expected. 'package' is a reserved word in strict mode. Class definitions are automatically in strict mode.
 tests/cases/compiler/strictModeReservedWordInClassDeclaration.ts(28,17): error TS2304: Cannot find name 'package'.
 
 
-==== tests/cases/compiler/strictModeReservedWordInClassDeclaration.ts (23 errors) ====
+==== tests/cases/compiler/strictModeReservedWordInClassDeclaration.ts (25 errors) ====
     interface public { }
     
     class Foo {
@@ -100,4 +101,6 @@ tests/cases/compiler/strictModeReservedWordInClassDeclaration.ts(28,17): error T
 !!! error TS2304: Cannot find name 'package'.
     class H extends package.A { }
                     ~~~~~~~
-!!! error TS2304: Cannot find name 'package'.
+!!! error TS1213: Identifier expected. 'package' is a reserved word in strict mode. Class definitions are automatically in strict mode.
+                    ~~~~~~~
+!!! error TS2304: Cannot find name 'package'.
