vhad/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/gosticks/DefinitelyTyped.git synced 2026-08-12 04:50:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Brandon Furtwangler
2016-02-08 20:44:12 -08:00
parent 9ac51b075a
commit dd328830dd
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bluebird/bluebird-1.0.d.ts
Vendored
+2 -2
View File
@@ -319,9 +319,9 @@ declare class Promise<R> implements Promise.Thenable<R> {
*
* Alias for `attempt();` for compatibility with earlier ECMAScript version.
*/
static try<R>(fn: () => R|Promise.Thenable<R>, args?: any[], ctx?: any): Promise<R>;
static try<R>(fn: () => R | Promise.Thenable<R>, args?: any[], ctx?: any): Promise<R>;
static attempt<R>(fn: () => R|Promise.Thenable<R>, args?: any[], ctx?: any): Promise<R>;
static attempt<R>(fn: () => R | Promise.Thenable<R>, args?: any[], ctx?: any): Promise<R>;
/**
* Returns a new function that wraps the given function `fn`. The new function will always return a promise that is fulfilled with the original functions return values or rejected with thrown exceptions from the original function.
bluebird/bluebird.d.ts
Vendored
-6
View File
@@ -51,15 +51,9 @@ interface PromiseConstructor {
*
* Alias for `attempt();` for compatibility with earlier ECMAScript version.
*/
<<<<<<< HEAD
try<T>(fn: () => T|PromiseLike<T>, args?: any[], ctx?: any): Promise<T>;
attempt<T>(fn: () => T|PromiseLike<T>, args?: any[], ctx?: any): Promise<T>;
=======
try<T>(fn: () => T | PromiseLike<T>, args?: any[], ctx?: any): Promise<T>;
attempt<T>(fn: () => T | PromiseLike<T>, args?: any[], ctx?: any): Promise<T>;
>>>>>>> 72f0056f69f9a2290d2589c1a692896d24406928
/**
* Returns a new function that wraps the given function `fn`. The new function will always return a promise that is fulfilled with the original functions return values or rejected with thrown exceptions from the original function.