Generic method cleanup (#1727)

Author: kevmoo

lib/src/asset/dart/serialize.dart

@@ -75,7 +75,7 @@ SourceLocation deserializeLocation(Map location) {
 /// Converts [stream] into a serializable map.
 ///
 /// [serializeEvent] is used to serialize each event from the stream.
-Map serializeStream/*<T>*/(Stream/*<T>*/ stream, serializeEvent(/*=T*/ event)) {
+Map serializeStream<T>(Stream<T> stream, serializeEvent(T event)) {
   var receivePort = new ReceivePort();
   var map = {'replyTo': receivePort.sendPort};
 
@@ -95,9 +95,7 @@ Map serializeStream/*<T>*/(Stream/*<T>*/ stream, serializeEvent(/*=T*/ event)) {
 /// Converts a serializable map into a [Stream].
 ///
 /// [deserializeEvent] is used to deserialize each event from the stream.
-Stream/*<T>*/ deserializeStream/*<T>*/(
-    Map stream,
-    /*=T*/ deserializeEvent(event)) {
+Stream<T> deserializeStream<T, S>(Map stream, T deserializeEvent(S event)) {
   return new LazyStream(() {
     var receivePort = new ReceivePort();
     stream['replyTo'].send({'replyTo': receivePort.sendPort});
@@ -128,14 +126,14 @@ Stream/*<T>*/ deserializeStream/*<T>*/(
 ///
 /// The returned Future will complete to the value or error returned by
 /// [respond].
-Future/*<T>*/ call/*<T>*/(SendPort port, message) {
+Future<T> call<T>(SendPort port, message) {
   var receivePort = new ReceivePort();
   port.send({'message': message, 'replyTo': receivePort.sendPort});
 
   return new Future.sync(() async {
     var response = await receivePort.first;
     if (response['type'] == 'success') {
-      return response['value'] as dynamic/*=T*/;
+      return response['value'] as T;
     }
     assert(response['type'] == 'error');
     var exception = deserializeException(response['error']);

lib/src/barback/pub_package_provider.dart

@@ -67,8 +67,7 @@ class PubPackageProvider implements StaticPackageProvider {
         return new Asset.fromPath(id, file);
       }
 
-      var versions = mapMap/*<String, Package, String, Version>*/(
-          _graph.packages,
+      var versions = mapMap<String, Package, String, Version>(_graph.packages,
           value: (_, package) => package.version);
       var contents = readTextFile(file);
       contents = preprocess(contents, versions, p.toUri(file));

lib/src/barback/transformer_isolate.dart

@@ -111,7 +111,7 @@ class TransformerIsolate {
   /// return an empty set.
   Future<Set<Transformer>> create(TransformerConfig config) async {
     try {
-      var transformers = (await call/*<List>*/(_port, {
+      var transformers = (await call<List>(_port, {
         'library': _idsToUrls[config.id].toString(),
         'mode': _mode.name,
         'configuration': JSON.encode(config.configuration)

lib/src/command/build.dart

@@ -93,7 +93,7 @@ class BuildCommand extends BarbackCommand {
       }
 
       var assets = await log
-          .progress/*<AssetSet>*/("Building ${entrypoint.root.name}", () async {
+          .progress<AssetSet>("Building ${entrypoint.root.name}", () async {
         // Register all of the build directories.
         // TODO(rnystrom): We don't actually need to bind servers for these, we
         // just need to add them to barback's sources. Add support to

lib/src/entrypoint.dart

@@ -767,7 +767,7 @@ class Entrypoint {
   /// Recursively lists the contents of [dir], excluding hidden `.DS_Store`
   /// files and `package` files.
   Iterable<String> _listDirWithoutPackages(dir) {
-    return listDir(dir).expand/*<String>*/((file) {
+    return listDir(dir).expand<String>((file) {
       if (p.basename(file) == 'packages') return [];
       if (!dirExists(file)) return [];
       var fileAndSubfiles = [file];

lib/src/error_group.dart

@@ -65,7 +65,7 @@ class ErrorGroup {
   ///
   /// If all members of [this] have already completed successfully or with an
   /// error, it's a [StateError] to try to register a new [Future].
-  Future/*<T>*/ registerFuture/*<T>*/(Future/*<T>*/ future) {
+  Future<T> registerFuture<T>(Future<T> future) {
     if (_isDone) {
       throw new StateError("Can't register new members on a complete "
           "ErrorGroup.");
@@ -88,7 +88,7 @@ class ErrorGroup {
   ///
   /// If all members of [this] have already completed successfully or with an
   /// error, it's a [StateError] to try to register a new [Stream].
-  Stream/*<T>*/ registerStream/*<T>*/(Stream/*<T>*/ stream) {
+  Stream<T> registerStream<T>(Stream<T> stream) {
     if (_isDone) {
       throw new StateError("Can't register new members on a complete "
           "ErrorGroup.");

lib/src/io.dart

@@ -197,7 +197,7 @@ Future<String> createFileFromStream(Stream<List<int>> stream, String file) {
   // TODO(nweiz): remove extra logging when we figure out the windows bot issue.
   log.io("Creating $file from stream.");
 
-  return _descriptorPool.withResource/*<Future<String>>*/(() async {
+  return _descriptorPool.withResource<Future<String>>(() async {
     _deleteIfLink(file);
     await stream.pipe(new File(file).openWrite());
     log.fine("Created $file from stream.");
@@ -653,9 +653,8 @@ Future flushThenExit(int status) {
 /// Returns a [EventSink] that pipes all data to [consumer] and a [Future] that
 /// will succeed when [EventSink] is closed or fail with any errors that occur
 /// while writing.
-Pair<EventSink/*<T>*/, Future> consumerToSink/*<T>*/(
-    StreamConsumer/*<T>*/ consumer) {
-  var controller = new StreamController/*<T>*/(sync: true);
+Pair<EventSink<T>, Future> consumerToSink<T>(StreamConsumer<T> consumer) {
+  var controller = new StreamController<T>(sync: true);
   var done = controller.stream.pipe(consumer);
   return new Pair(controller.sink, done);
 }
@@ -697,7 +696,7 @@ Future store(Stream stream, EventSink sink,
 /// the inherited variables.
 Future<PubProcessResult> runProcess(String executable, List<String> args,
     {workingDir, Map<String, String> environment, bool runInShell: false}) {
-  return _descriptorPool.withResource/*<Future<PubProcessResult>>*/(() async {
+  return _descriptorPool.withResource<Future<PubProcessResult>>(() async {
     var result = await _doProcess(Process.run, executable, args,
         workingDir: workingDir,
         environment: environment,
@@ -869,7 +868,7 @@ void touch(String path) {
 ///
 /// Returns a future that completes to the value that the future returned from
 /// [fn] completes to.
-Future/*<T>*/ withTempDir/*<T>*/(Future/*<T>*/ fn(String path)) async {
+Future<T> withTempDir<T>(Future<T> fn(String path)) async {
   var tempDir = createSystemTempDir();
   try {
     return await fn(tempDir);

lib/src/log.dart

@@ -400,7 +400,7 @@ void dumpTranscript() {
 /// [progress]) that cancels the progress animation, although the total time
 /// will still be printed once it finishes. If [fine] is passed, the progress
 /// information will only be visible at [Level.FINE].
-Future/*<T>*/ progress/*<T>*/(String message, Future/*<T>*/ callback(),
+Future<T> progress<T>(String message, Future<T> callback(),
     {bool fine: false}) {
   _stopProgress();
 

lib/src/oauth2.dart

@@ -79,7 +79,7 @@ void clearCredentials(SystemCache cache) {
 /// This takes care of loading and saving the client's credentials, as well as
 /// prompting the user for their authorization. It will also re-authorize and
 /// re-run [fn] if a recoverable authorization error is detected.
-Future withClient(SystemCache cache, Future fn(Client client)) {
+Future<T> withClient<T>(SystemCache cache, Future<T> fn(Client client)) {
   return _getClient(cache).then((client) {
     return fn(client).whenComplete(() {
       client.close();

lib/src/package_graph.dart

@@ -81,11 +81,11 @@ class PackageGraph {
 
     if (_transitiveDependencies == null) {
       var closure = transitiveClosure(
-          mapMap/*<String, Package, String, Iterable<String>>*/(packages,
+          mapMap<String, Package, String, Iterable<String>>(packages,
               value: (_, package) =>
                   package.dependencies.map((dep) => dep.name)));
       _transitiveDependencies =
-          mapMap/*<String, Set<String>, String, Set<Package>>*/(closure,
+          mapMap<String, Set<String>, String, Set<Package>>(closure,
               value: (depender, names) {
         var set = names.map((name) => packages[name]).toSet();
         set.add(packages[depender]);