Index: pkg/compiler/lib/src/dart_types.dart |
diff --git a/pkg/compiler/lib/src/dart_types.dart b/pkg/compiler/lib/src/dart_types.dart |
index 17e6472127b790a4d8829a7914be01bd0cb33a57..c304c4d02e73e316698efdcb1114d9684113f97c 100644 |
--- a/pkg/compiler/lib/src/dart_types.dart |
+++ b/pkg/compiler/lib/src/dart_types.dart |
@@ -7,14 +7,21 @@ library dart_types; |
import 'dart:math' show min; |
import 'core_types.dart'; |
-import 'dart2jslib.dart' show Compiler, invariant, Script, Message; |
-import 'elements/modelx.dart' |
- show LibraryElementX, |
- TypeDeclarationElementX, |
- TypedefElementX; |
+import 'compiler.dart' show |
+ Compiler; |
+import 'diagnostics/invariant.dart' show |
+ invariant; |
+import 'diagnostics/spannable.dart' show |
+ CURRENT_ELEMENT_SPANNABLE; |
+import 'elements/modelx.dart' show |
+ LibraryElementX, |
+ TypeDeclarationElementX, |
+ TypedefElementX; |
import 'elements/elements.dart'; |
-import 'ordered_typeset.dart' show OrderedTypeSet; |
-import 'util/util.dart' show CURRENT_ELEMENT_SPANNABLE, equalElements; |
+import 'ordered_typeset.dart' show |
+ OrderedTypeSet; |
+import 'util/util.dart' show |
+ equalElements; |
enum TypeKind { |
FUNCTION, |