Revert "Add support for the new function-type syntax."

pkg/compiler/lib/src/serialization/equivalence.dart

Index: pkg/compiler/lib/src/serialization/equivalence.dart
diff --git a/pkg/compiler/lib/src/serialization/equivalence.dart b/pkg/compiler/lib/src/serialization/equivalence.dart
index 6322a05e94d3fd567186c3be7389dfa68da5b696..3fd3f451a665029061a93ba5cbba20e11e7b4290 100644
--- a/pkg/compiler/lib/src/serialization/equivalence.dart
+++ b/pkg/compiler/lib/src/serialization/equivalence.dart
@@ -2044,8 +2044,7 @@ class NodeEquivalenceVisitor implements Visitor1<bool, Node> {
   }
 
   @override
-  bool visitNominalTypeAnnotation(
-      NominalTypeAnnotation node1, NominalTypeAnnotation node2) {
+  bool visitTypeAnnotation(TypeAnnotation node1, TypeAnnotation node2) {
     return testNodes(
             node1, node2, 'typeName', node1.typeName, node2.typeName) &&
         testNodes(node1, node2, 'typeArguments', node1.typeArguments,
@@ -2053,16 +2052,6 @@ class NodeEquivalenceVisitor implements Visitor1<bool, Node> {
   }
 
   @override
-  bool visitFunctionTypeAnnotation(
-      FunctionTypeAnnotation node1, FunctionTypeAnnotation node2) {
-    return testNodes(
-        node1, node2, 'returnType', node1.returnType, node2.returnType) &&
-        testNodes(node1, node2, 'formals', node1.formals, node2.formals) &&
-            testNodes(node1, node2, 'typeParameters', node1.typeParameters,
-                node2.typeParameters);
-  }
-
-  @override
   bool visitTypeVariable(TypeVariable node1, TypeVariable node2) {
     return testNodes(node1, node2, 'name', node1.name, node2.name) &&
         testNodes(node1, node2, 'bound', node1.bound, node2.bound);
@@ -2076,8 +2065,8 @@ class NodeEquivalenceVisitor implements Visitor1<bool, Node> {
         testNodes(
             node1, node2, 'returnType', node1.returnType, node2.returnType) &&
         testNodes(node1, node2, 'name', node1.name, node2.name) &&
-        testNodes(node1, node2, 'typeParameters', node1.templateParameters,
-            node2.templateParameters) &&
+        testNodes(node1, node2, 'typeParameters', node1.typeParameters,
+            node2.typeParameters) &&
         testNodes(node1, node2, 'formals', node1.formals, node2.formals);
   }
 
@@ -2132,11 +2121,6 @@ class NodeEquivalenceVisitor implements Visitor1<bool, Node> {
   bool visitStringNode(StringNode node1, StringNode node2) {
     throw new UnsupportedError('Unexpected nodes: $node1 <> $node2');
   }
-
-  @override
-  bool visitTypeAnnotation(TypeAnnotation node1, TypeAnnotation node2) {
-    throw new UnsupportedError('Unexpected nodes: $node1 <> $node2');
-  }
 }
 
 bool areMetadataAnnotationsEquivalent(