Fix analysis hints (#1740)

Author: nex3

lib/src/asset/dart/serialize/aggregate_transform.dart

@@ -136,10 +136,8 @@ class ForeignAggregateTransform extends _ForeignBaseAggregateTransform
             deserializeStream(transform['primaryInputs'], deserializeAsset),
         super(transform);
 
-  Future<Asset> getInput(AssetId id) {
-    return call(_port, {'type': 'getInput', 'id': serializeId(id)})
-        .then(deserializeAsset);
-  }
+  Future<Asset> getInput(AssetId id) async => deserializeAsset(
+      await call(_port, {'type': 'getInput', 'id': serializeId(id)}));
 
   void addOutput(Asset output) {
     call(_port, {'type': 'addOutput', 'output': serializeAsset(output)});

lib/src/asset/dart/serialize/transform.dart

@@ -115,10 +115,8 @@ class ForeignTransform extends _ForeignBaseTransform
       : primaryInput = deserializeAsset(transform['primaryInput']),
         super(transform);
 
-  Future<Asset> getInput(AssetId id) {
-    return call(_port, {'type': 'getInput', 'id': serializeId(id)})
-        .then(deserializeAsset);
-  }
+  Future<Asset> getInput(AssetId id) async => deserializeAsset(
+      await call(_port, {'type': 'getInput', 'id': serializeId(id)}));
 
   void addOutput(Asset output) {
     call(_port, {'type': 'addOutput', 'output': serializeAsset(output)});

lib/src/pubspec.dart

@@ -5,6 +5,7 @@
 import 'dart:io';
 
 import 'package:collection/collection.dart';
+import 'package:meta/meta.dart';
 import 'package:path/path.dart' as path;
 import 'package:pub_semver/pub_semver.dart';
 import 'package:source_span/source_span.dart';
@@ -879,6 +880,9 @@ class Pubspec {
     if (node == null || node.value == null) return new YamlList();
     if (node is YamlList) return node;
     _error('Must be a list.', node.span);
+
+    // TODO(nweiz): Remove this when sdk#31384 is fixed.
+    throw "Unreachable";
   }
 
   /// Runs [fn] and wraps any [FormatException] it throws in a
@@ -904,6 +908,7 @@ class Pubspec {
   }
 
   /// Throws a [PubspecException] with the given message.
+  @alwaysThrows
   void _error(String message, SourceSpan span) {
     throw new PubspecException(message, span);
   }

lib/src/source/hosted.dart

@@ -220,7 +220,7 @@ class BoundHostedSource extends CachedSource {
     for (var serverDir in listDir(systemCacheRoot)) {
       var url = _directoryToUrl(p.basename(serverDir));
 
-      var packages = [];
+      var packages = <Package>[];
       for (var entry in listDir(serverDir)) {
         try {
           packages.add(new Package.load(null, entry, systemCache.sources));

lib/src/utils.dart

@@ -321,8 +321,8 @@ Set<String> createDirectoryFilter(Iterable<String> dirs) {
 /// Returns the maximum value in [iter] by [compare].
 ///
 /// [compare] defaults to [Comparable.compare].
-maxAll(Iterable iter, [int compare(element1, element2)]) {
-  if (compare == null) compare = Comparable.compare;
+T maxAll<T>(Iterable<T> iter, [int compare(T value, T value2)]) {
+  compare ??= (value1, value2) => (value1 as Comparable).compareTo(value2);
   return iter
       .reduce((max, element) => compare(element, max) > 0 ? element : max);
 }

pubspec.yaml

@@ -20,7 +20,7 @@ dependencies:
   http_multi_server: ">=1.0.0 <3.0.0"
   http_throttle: "^1.0.0"
   json_rpc_2: "^2.0.0"
-  meta: ">=0.12.2 <2.0.0"
+  meta: "^1.1.0"
   mime: "^0.9.0"
   oauth2: "^1.0.0"
   package_config: "^1.0.0"

test/serve/utils.dart

@@ -322,7 +322,9 @@ Future _ensureWebSocket() async {
   var socket = await WebSocket.connect("ws://localhost:$_adminPort");
   _webSocket = socket;
   // TODO(rnystrom): Works around #13913.
-  _webSocketBroadcastStream = _webSocket.map(JSON.decode).asBroadcastStream();
+  _webSocketBroadcastStream = _webSocket
+      .map((message) => JSON.decode(message as String))
+      .asBroadcastStream();
 }
 
 /// Closes the web socket connection to the currently-running pub serve.