Accept baselines after merge

This commit is contained in:
Jason Freeman 2015-05-08 15:45:16 -07:00
parent 1a14725c32
commit 7c6eed727f
2 changed files with 8 additions and 9 deletions

View File

@ -27,7 +27,6 @@ let C = class {
this.x = yield 0;
}
};
Object.defineProperty(C, "name", { value: "C", configurable: true });
C = __decorate([
decorator(yield, 0)
], C);

View File

@ -22,13 +22,13 @@ interface T3 {
function f1(): Promise<T1> {
>f1 : Symbol(f1, Decl(promiseVoidErrorCallback.ts, 10, 1))
>Promise : Symbol(Promise, Decl(lib.d.ts, 4769, 1), Decl(lib.d.ts, 4854, 11))
>Promise : Symbol(Promise, Decl(lib.d.ts, 4761, 1), Decl(lib.d.ts, 4846, 11))
>T1 : Symbol(T1, Decl(promiseVoidErrorCallback.ts, 0, 0))
return Promise.resolve({ __t1: "foo_t1" });
>Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.d.ts, 4836, 39), Decl(lib.d.ts, 4843, 54))
>Promise : Symbol(Promise, Decl(lib.d.ts, 4769, 1), Decl(lib.d.ts, 4854, 11))
>resolve : Symbol(PromiseConstructor.resolve, Decl(lib.d.ts, 4836, 39), Decl(lib.d.ts, 4843, 54))
>Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.d.ts, 4828, 39), Decl(lib.d.ts, 4835, 54))
>Promise : Symbol(Promise, Decl(lib.d.ts, 4761, 1), Decl(lib.d.ts, 4846, 11))
>resolve : Symbol(PromiseConstructor.resolve, Decl(lib.d.ts, 4828, 39), Decl(lib.d.ts, 4835, 54))
>__t1 : Symbol(__t1, Decl(promiseVoidErrorCallback.ts, 13, 28))
}
@ -47,12 +47,12 @@ function f2(x: T1): T2 {
var x3 = f1()
>x3 : Symbol(x3, Decl(promiseVoidErrorCallback.ts, 20, 3))
>f1() .then(f2, (e: Error) => { throw e;}) .then : Symbol(Promise.then, Decl(lib.d.ts, 4774, 22), Decl(lib.d.ts, 4781, 158))
>f1() .then : Symbol(Promise.then, Decl(lib.d.ts, 4774, 22), Decl(lib.d.ts, 4781, 158))
>f1() .then(f2, (e: Error) => { throw e;}) .then : Symbol(Promise.then, Decl(lib.d.ts, 4766, 22), Decl(lib.d.ts, 4773, 158))
>f1() .then : Symbol(Promise.then, Decl(lib.d.ts, 4766, 22), Decl(lib.d.ts, 4773, 158))
>f1 : Symbol(f1, Decl(promiseVoidErrorCallback.ts, 10, 1))
.then(f2, (e: Error) => {
>then : Symbol(Promise.then, Decl(lib.d.ts, 4774, 22), Decl(lib.d.ts, 4781, 158))
>then : Symbol(Promise.then, Decl(lib.d.ts, 4766, 22), Decl(lib.d.ts, 4773, 158))
>f2 : Symbol(f2, Decl(promiseVoidErrorCallback.ts, 14, 1))
>e : Symbol(e, Decl(promiseVoidErrorCallback.ts, 21, 15))
>Error : Symbol(Error, Decl(lib.d.ts, 876, 38), Decl(lib.d.ts, 889, 11))
@ -62,7 +62,7 @@ var x3 = f1()
})
.then((x: T2) => {
>then : Symbol(Promise.then, Decl(lib.d.ts, 4774, 22), Decl(lib.d.ts, 4781, 158))
>then : Symbol(Promise.then, Decl(lib.d.ts, 4766, 22), Decl(lib.d.ts, 4773, 158))
>x : Symbol(x, Decl(promiseVoidErrorCallback.ts, 24, 11))
>T2 : Symbol(T2, Decl(promiseVoidErrorCallback.ts, 2, 1))