From 853d2cbfd4db052172ac60c3a7e3f4258ad163b7 Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Wed, 15 Feb 2017 13:34:07 -0800
Subject: [PATCH] steed: Clean up callbacks

---
 steed/index.d.ts  | 19 +++++++++----------
 steed/tslint.json |  6 ++++++
 2 files changed, 15 insertions(+), 10 deletions(-)
 create mode 100644 steed/tslint.json

diff --git a/steed/index.d.ts b/steed/index.d.ts
index ba4b199999..4865c8efa8 100644
--- a/steed/index.d.ts
+++ b/steed/index.d.ts
@@ -3,22 +3,21 @@
 // Definitions by: Paul Isache <https://github.com/Paul-Isache>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
 declare namespace steed {
     interface Dictionary<T> { [key: string]: T; }
-    interface ErrorCallback<T> { (err?: T): void; }
+    type ErrorCallback<T> = (err?: T) => void;
 
-    interface SteedResultCallback<T, E> { (err: E, result: T): void; }
-    interface SteedResultArrayCallback<T, E> { (err: E, results: T[]): void; }
-    interface SteedResultObjectCallback<T, E> { (err: E, results: Dictionary<T>): void; }
+    type SteedResultCallback<T, E> = (err: E, result: T) => void;
+    type SteedResultArrayCallback<T, E> = (err: E, results: T[]) => void;
+    type SteedResultObjectCallback<T, E> = (err: E, results: Dictionary<T>) => void;
 
-    interface SteedWorker<T, E> { (task: T, callback: ErrorCallback<E>): void; }
-    interface SteedIterator<T, E> { (item: T, callback: ErrorCallback<E>): void; }
-    interface SteedResultIterator<T, R, E> { (item: T, callback: SteedResultCallback<R, E>): void; }
-    interface SteedFunction<T, E> { (callback: (err?: E, result?: T) => void): void; }
+    type SteedWorker<T, E> = (task: T, callback: ErrorCallback<E>) => void;
+    type SteedIterator<T, E> = (item: T, callback: ErrorCallback<E>) => void;
+    type SteedResultIterator<T, R, E> = (item: T, callback: SteedResultCallback<R, E>) => void;
+    type SteedFunction<T, E> = (callback: (err?: E, result?: T) => void) => void;
 
     interface SteedQueue<T> {
-        push<E>(task: T | T[], callback?: ErrorCallback<E> | SteedResultCallback<T, E>): void;
+        push<E>(task: T | T[], callback?: SteedResultCallback<T, E>): void;
         unshift<E>(task: T | T[], callback?: ErrorCallback<E>): void;
         pause(): void;
         resume(): void;
diff --git a/steed/tslint.json b/steed/tslint.json
new file mode 100644
index 0000000000..f05741c59b
--- /dev/null
+++ b/steed/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "../tslint.json",
+    "rules": {
+        "forbidden-types": false
+    }
+}