Removed fixed dependencies

packages/analyzer/lib/src/cancelable_future.dart

Index: packages/analyzer/lib/src/cancelable_future.dart
diff --git a/packages/analyzer/lib/src/cancelable_future.dart b/packages/analyzer/lib/src/cancelable_future.dart
index 733cac55f9984e44680f5ab143087d4a75c08dce..43eb00c10c299b3d0fac32a535653a02758df55d 100644
--- a/packages/analyzer/lib/src/cancelable_future.dart
+++ b/packages/analyzer/lib/src/cancelable_future.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library cancelable_future;
+library analyzer.src.cancelable_future;
 
 import 'dart:async';
 
@@ -248,15 +248,15 @@ class _CancelableCompleterFuture<T> implements CancelableFuture<T> {
   }
 
   @override
-  Future catchError(Function onError, {bool test(Object error)}) =>
+  Future<T> catchError(Function onError, {bool test(Object error)}) =>
       _completer._outerCompleter.future.catchError(onError, test: test);
 
   @override
-  Future then(onValue(T value), {Function onError}) =>
+  Future/*<S>*/ then/*<S>*/(onValue(T value), {Function onError}) =>
       _completer._outerCompleter.future.then(onValue, onError: onError);
 
   @override
-  Future timeout(Duration timeLimit, {onTimeout()}) {
+  Future<T> timeout(Duration timeLimit, {onTimeout()}) {
     // TODO(paulberry): Implement this in such a way that a timeout cancels
     // the future.
     return _completer._outerCompleter.future
@@ -284,15 +284,15 @@ class _WrappedFuture<T> implements CancelableFuture<T> {
   void cancel() {}
 
   @override
-  Future catchError(Function onError, {bool test(Object error)}) =>
+  Future<T> catchError(Function onError, {bool test(Object error)}) =>
       _future.catchError(onError, test: test);
 
   @override
-  Future then(onValue(value), {Function onError}) =>
+  Future/*<S>*/ then/*<S>*/(onValue(T value), {Function onError}) =>
       _future.then(onValue, onError: onError);
 
   @override
-  Future timeout(Duration timeLimit, {onTimeout()}) =>
+  Future<T> timeout(Duration timeLimit, {onTimeout()}) =>
       _future.timeout(timeLimit, onTimeout: onTimeout);
 
   @override