Require two type arguments for map literals (issue 4522).

pkg/dartdoc/mirrors/dart2js_mirror.dart

Index: pkg/dartdoc/mirrors/dart2js_mirror.dart
===================================================================
--- pkg/dartdoc/mirrors/dart2js_mirror.dart	(revision 10860)
+++ pkg/dartdoc/mirrors/dart2js_mirror.dart	(working copy)
@@ -317,7 +317,7 @@
 
   Dart2JsCompilation(Path script, Path libraryRoot,
                      [Path packageRoot, List<String> opts = const <String>[]])
-      : cwd = getCurrentDirectory(), sourceFiles = <SourceFile>{} {
+      : cwd = getCurrentDirectory(), sourceFiles = <String, SourceFile>{} {
     var libraryUri = cwd.resolve(libraryRoot.toString());
     var packageUri;
     if (packageRoot !== null) {
@@ -334,7 +334,7 @@
 
   Dart2JsCompilation.library(List<Path> libraries, Path libraryRoot,
                      [Path packageRoot, List<String> opts = const <String>[]])
-      : cwd = getCurrentDirectory(), sourceFiles = <SourceFile>{} {
+      : cwd = getCurrentDirectory(), sourceFiles = <String, SourceFile>{} {
     var libraryUri = cwd.resolve(libraryRoot.toString());
     var packageUri;
     if (packageRoot !== null) {
@@ -426,7 +426,7 @@
 
   void _ensureLibraries() {
     if (_libraries == null) {
-      _libraries = <Dart2JsLibraryMirror>{};
+      _libraries = <String, Dart2JsLibraryMirror>{};
       compiler.libraries.forEach((_, LibraryElement v) {
         var mirror = new Dart2JsLibraryMirror(system, v);
         _libraries[mirror.canonicalName] = mirror;
@@ -494,7 +494,7 @@
 
   void _ensureTypes() {
     if (_types == null) {
-      _types = <InterfaceMirror>{};
+      _types = <String, InterfaceMirror>{};
       _library.forEachExport((Element e) {
         if (e.getLibrary() == _library) {
           if (e.isClass()) {
@@ -512,7 +512,7 @@
 
   void _ensureMembers() {
     if (_members == null) {
-      _members = <MemberMirror>{};
+      _members = <String, MemberMirror>{};
       _library.forEachExport((Element e) {
         if (!e.isClass() && !e.isTypedef()) {
           for (var member in _convertElementMemberToMemberMirrors(this, e)) {
@@ -682,7 +682,7 @@
 
   void _ensureMembers() {
     if (_members == null) {
-      _members = <Dart2JsMemberMirror>{};
+      _members = <String, Dart2JsMemberMirror>{};
       _class.localMembers.forEach((e) {
         for (var member in _convertElementMemberToMemberMirrors(this, e)) {
           _members[member.canonicalName] = member;
@@ -854,14 +854,16 @@
     return _definition;
   }
 
-  Map<Object, MemberMirror> get declaredMembers() => const <MemberMirror>{};
+  Map<Object, MemberMirror> get declaredMembers() =>
+      const <String, MemberMirror>{};
 
   InterfaceMirror get declaration() => this;
 
   // TODO(johnniwinther): How should a typedef respond to these?
   InterfaceMirror get superclass() => null;
 
-  Map<Object, InterfaceMirror> get interfaces() => const <InterfaceMirror>{};
+  Map<Object, InterfaceMirror> get interfaces() =>
+      const <String, InterfaceMirror>{};
 
   bool get isClass() => false;
 
@@ -871,7 +873,8 @@
 
   bool get isDeclaration() => true;
 
-  Map<Object, MethodMirror> get constructors() => const <MethodMirror>{};
+  Map<Object, MethodMirror> get constructors() =>
+      const <String, MethodMirror>{};
 
   InterfaceMirror get defaultType() => null;
 }
@@ -1123,7 +1126,8 @@
 
   List<TypeVariableMirror> get typeVariables() => declaration.typeVariables;
 
-  Map<Object, MethodMirror> get constructors() => <MethodMirror>{};
+  Map<Object, MethodMirror> get constructors() =>
+      <String, MethodMirror>{};
 
   InterfaceMirror get defaultType() => null;