Rename Type to DartType to avoid conflicts with the class Type in the core library.

lib/compiler/implementation/dart_backend/placeholder_collector.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // 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.
 
 class LocalPlaceholder implements Hashable {
   final String identifier;
   final Set<Node> nodes;
   LocalPlaceholder(this.identifier) : nodes = new Set<Node>();
   int hashCode() => identifier.hashCode();
   String toString() =>
@@ skipping 267 matching lines @@
   void tryMakeMemberPlaceholder(Identifier node) {
     assert(node !== null);
     if (node.source.isPrivate()) return;
     if (node is Operator) return;
     final identifier = node.source.slowToString();
     if (fixedMemberNames.contains(identifier)) return;
     memberPlaceholders.putIfAbsent(
         identifier, () => new Set<Identifier>()).add(node);
   }
 
-  void makeTypePlaceholder(Node node, Type type) {
+  void makeTypePlaceholder(Node node, DartType type) {
     makeElementPlaceholder(node, type.element);
   }
 
   void makeOmitDeclarationTypePlaceholder(TypeAnnotation type) {
     if (type === null) return;
     declarationTypePlaceholders.add(
         new DeclarationTypePlaceholder(type, false));
   }
 
   void makeVarDeclarationTypePlaceholder(VariableDefinitions node) {
@@ skipping 219 matching lines @@
     }
   }
 
   visitClassNode(ClassNode node) {
     ClassElement classElement = currentElement;
     makeElementPlaceholder(node.name, classElement);
     node.visitChildren(this);
     if (node.defaultClause !== null) {
       // Can't just visit class node's default clause because of the bug in the
       // resolver, it just crashes when it meets type variable.
-      Type defaultType = classElement.defaultClass;
+      DartType defaultType = classElement.defaultClass;
       assert(defaultType !== null);
       makeTypePlaceholder(node.defaultClause.typeName, defaultType);
       visit(node.defaultClause.typeArguments);
     }
   }
 
   bool tryResolveAndCollectTypeVariable(
       TypeDeclarationElement typeDeclaration, Identifier name) {
     // Hack for case when interface and default class are in different
     // libraries, try to resolve type variable to default class type arg.
     // Example:
     // lib1: interface I<K> default C<K> {...}
     // lib2: class C<K> {...}
     if (typeDeclaration is ClassElement
         && (typeDeclaration as ClassElement).defaultClass !== null) {
       typeDeclaration = (typeDeclaration as ClassElement).defaultClass.element;
     }
     // Another poor man type resolution.
     // Find this variable in enclosing type declaration parameters.
-    for (Type type in typeDeclaration.typeVariables) {
+    for (DartType type in typeDeclaration.typeVariables) {
       if (type.name.slowToString() == name.source.slowToString()) {
         makeTypePlaceholder(name, type);
         return true;
       }
     }
     return false;
   }
 
   visitTypeVariable(TypeVariable node) {
     assert(currentElement is TypedefElement || currentElement is ClassElement);
@@ skipping 11 matching lines @@
 
   visitBlock(Block node) {
     for (Node statement in node.statements.nodes) {
       if (statement is VariableDefinitions) {
         makeVarDeclarationTypePlaceholder(statement);
       }
     }
     node.visitChildren(this);
   }
 }