From 7ed52044d11fb30e396a171847faee0fa1d5ce42 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Thu, 3 Nov 2016 10:54:07 -0700
Subject: [PATCH] Update objectRestAssignment test and baselines

---
 .../reference/objectRestAssignment.js         | 10 ++---
 .../reference/objectRestAssignment.symbols    | 40 +++++++++----------
 .../reference/objectRestAssignment.types      | 28 ++++++-------
 3 files changed, 36 insertions(+), 42 deletions(-)

diff --git a/tests/baselines/reference/objectRestAssignment.js b/tests/baselines/reference/objectRestAssignment.js
index 7ecd54c5152..20f87ff8375 100644
--- a/tests/baselines/reference/objectRestAssignment.js
+++ b/tests/baselines/reference/objectRestAssignment.js
@@ -1,9 +1,8 @@
 //// [objectRestAssignment.ts]
-let x;
-let ka;
-let nested;
-let other;
-let rest;
+let ka: any;
+let nested: { ki };
+let other: number;
+let rest: { };
 let complex: { x: { ka, ki }, y: number };
 ({x: { ka, ...nested }, y: other, ...rest} = complex);
 
@@ -15,7 +14,6 @@ var __rest = (this && this.__rest) || function (s, e) {
         t[p] = s[p];
     return t;
 };
-var x;
 var ka;
 var nested;
 var other;
diff --git a/tests/baselines/reference/objectRestAssignment.symbols b/tests/baselines/reference/objectRestAssignment.symbols
index 3c54290b595..38127dbee2d 100644
--- a/tests/baselines/reference/objectRestAssignment.symbols
+++ b/tests/baselines/reference/objectRestAssignment.symbols
@@ -1,30 +1,28 @@
 === tests/cases/conformance/types/rest/objectRestAssignment.ts ===
-let x;
->x : Symbol(x, Decl(objectRestAssignment.ts, 0, 3))
+let ka: any;
+>ka : Symbol(ka, Decl(objectRestAssignment.ts, 0, 3))
 
-let ka;
->ka : Symbol(ka, Decl(objectRestAssignment.ts, 1, 3))
+let nested: { ki };
+>nested : Symbol(nested, Decl(objectRestAssignment.ts, 1, 3))
+>ki : Symbol(ki, Decl(objectRestAssignment.ts, 1, 13))
 
-let nested;
->nested : Symbol(nested, Decl(objectRestAssignment.ts, 2, 3))
+let other: number;
+>other : Symbol(other, Decl(objectRestAssignment.ts, 2, 3))
 
-let other;
->other : Symbol(other, Decl(objectRestAssignment.ts, 3, 3))
-
-let rest;
->rest : Symbol(rest, Decl(objectRestAssignment.ts, 4, 3))
+let rest: { };
+>rest : Symbol(rest, Decl(objectRestAssignment.ts, 3, 3))
 
 let complex: { x: { ka, ki }, y: number };
->complex : Symbol(complex, Decl(objectRestAssignment.ts, 5, 3))
->x : Symbol(x, Decl(objectRestAssignment.ts, 5, 14))
->ka : Symbol(ka, Decl(objectRestAssignment.ts, 5, 19))
->ki : Symbol(ki, Decl(objectRestAssignment.ts, 5, 23))
->y : Symbol(y, Decl(objectRestAssignment.ts, 5, 29))
+>complex : Symbol(complex, Decl(objectRestAssignment.ts, 4, 3))
+>x : Symbol(x, Decl(objectRestAssignment.ts, 4, 14))
+>ka : Symbol(ka, Decl(objectRestAssignment.ts, 4, 19))
+>ki : Symbol(ki, Decl(objectRestAssignment.ts, 4, 23))
+>y : Symbol(y, Decl(objectRestAssignment.ts, 4, 29))
 
 ({x: { ka, ...nested }, y: other, ...rest} = complex);
->x : Symbol(x, Decl(objectRestAssignment.ts, 6, 2))
->ka : Symbol(ka, Decl(objectRestAssignment.ts, 6, 6))
->y : Symbol(y, Decl(objectRestAssignment.ts, 6, 23))
->other : Symbol(other, Decl(objectRestAssignment.ts, 3, 3))
->complex : Symbol(complex, Decl(objectRestAssignment.ts, 5, 3))
+>x : Symbol(x, Decl(objectRestAssignment.ts, 5, 2))
+>ka : Symbol(ka, Decl(objectRestAssignment.ts, 5, 6))
+>y : Symbol(y, Decl(objectRestAssignment.ts, 5, 23))
+>other : Symbol(other, Decl(objectRestAssignment.ts, 2, 3))
+>complex : Symbol(complex, Decl(objectRestAssignment.ts, 4, 3))
 
diff --git a/tests/baselines/reference/objectRestAssignment.types b/tests/baselines/reference/objectRestAssignment.types
index 5af3e5872b9..a4d88f89bb2 100644
--- a/tests/baselines/reference/objectRestAssignment.types
+++ b/tests/baselines/reference/objectRestAssignment.types
@@ -1,18 +1,16 @@
 === tests/cases/conformance/types/rest/objectRestAssignment.ts ===
-let x;
->x : any
-
-let ka;
+let ka: any;
 >ka : any
 
-let nested;
->nested : any
+let nested: { ki };
+>nested : { ki: any; }
+>ki : any
 
-let other;
->other : any
+let other: number;
+>other : number
 
-let rest;
->rest : any
+let rest: { };
+>rest : {}
 
 let complex: { x: { ka, ki }, y: number };
 >complex : { x: { ka: any; ki: any; }; y: number; }
@@ -24,13 +22,13 @@ let complex: { x: { ka, ki }, y: number };
 ({x: { ka, ...nested }, y: other, ...rest} = complex);
 >({x: { ka, ...nested }, y: other, ...rest} = complex) : { x: { ka: any; ki: any; }; y: number; }
 >{x: { ka, ...nested }, y: other, ...rest} = complex : { x: { ka: any; ki: any; }; y: number; }
->{x: { ka, ...nested }, y: other, ...rest} : { x: { ka: any; }; y: any; }
->x : { ka: any; }
->{ ka, ...nested } : { ka: any; }
+>{x: { ka, ...nested }, y: other, ...rest} : { x: { ki: any; ka: any; }; y: number; }
+>x : { ki: any; ka: any; }
+>{ ka, ...nested } : { ki: any; ka: any; }
 >ka : any
 >nested : any
->y : any
->other : any
+>y : number
+>other : number
 >rest : any
 >complex : { x: { ka: any; ki: any; }; y: number; }