From e85547aa456be58ab6b9be66a0c7b14764f80d5a Mon Sep 17 00:00:00 2001
From: Rafael Santana <rafaelsantana3095@gmail.com>
Date: Wed, 11 Apr 2018 14:39:13 -0300
Subject: [PATCH] refactor: remove duplicate types and correct some TODOs
 (#10763)

---
 src/cdk/table/table.ts        | 2 +-
 src/lib/icon/icon-registry.ts | 2 +-
 src/lib/menu/menu-trigger.ts  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/cdk/table/table.ts b/src/cdk/table/table.ts
index 1e628c35773..f2399144594 100644
--- a/src/cdk/table/table.ts
+++ b/src/cdk/table/table.ts
@@ -178,7 +178,7 @@ export class CdkTable<T> implements CollectionViewer, OnInit, AfterContentChecke
       this._switchDataSource(dataSource);
     }
   }
-  private _dataSource: DataSource<T> | Observable<T[]> | T[] | T[];
+  private _dataSource: DataSource<T> | Observable<T[]> | T[];
 
   // TODO(andrewseguin): Remove max value as the end index
   //   and instead calculate the view on init and scroll.
diff --git a/src/lib/icon/icon-registry.ts b/src/lib/icon/icon-registry.ts
index a262b91d9c8..72e97079150 100644
--- a/src/lib/icon/icon-registry.ts
+++ b/src/lib/icon/icon-registry.ts
@@ -544,7 +544,7 @@ export class MatIconRegistry {
       return inProgressFetch;
     }
 
-    // TODO(jelbourn): for some reason, the `finally` operator "loses" the generic type on the
+    // TODO(jelbourn): for some reason, the `finalize` operator "loses" the generic type on the
     // Observable. Figure out why and fix it.
     const req = this._httpClient.get(url, {responseType: 'text'}).pipe(
       finalize(() => this._inProgressUrlFetches.delete(url)),
diff --git a/src/lib/menu/menu-trigger.ts b/src/lib/menu/menu-trigger.ts
index 5531ffc26bf..86a1a6a89da 100644
--- a/src/lib/menu/menu-trigger.ts
+++ b/src/lib/menu/menu-trigger.ts
@@ -52,11 +52,11 @@ export const MAT_MENU_SCROLL_STRATEGY =
       }
     });
 
-// TODO(andrewseguin): Remove the kebab versions in favor of camelCased attribute selectors
-
 /** Default top padding of the menu panel. */
 export const MENU_PANEL_TOP_PADDING = 8;
 
+// TODO(andrewseguin): Remove the kebab versions in favor of camelCased attribute selectors
+
 /**
  * This directive is intended to be used in conjunction with an mat-menu tag.  It is
  * responsible for toggling the display of the provided menu instance.