Do not put renaming logic into Unparser.

lib/compiler/implementation/tree/unparser.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.
 
-// Returns null if no need to rename a node.
-typedef String Renamer(Node node);
-
 String unparse(Node node) {
   Unparser unparser = new Unparser();
   unparser.unparse(node);
   return unparser.result;
 }
 
 class Unparser implements Visitor {
-  Renamer rename;
   final StringBuffer sb;
 
   String get result => sb.toString();
 
-  Unparser() : sb = new StringBuffer() {
-    // TODO(smok): Move this to initializer once dart2js stops complaining
-    // about closures in initializers.
-    rename = (Node node) => null;
-  }
-  Unparser.withRenamer(this.rename) : sb = new StringBuffer();
+  Unparser() : sb = new StringBuffer();
 
   void add(SourceString string) {
     string.printOn(sb);
   }
 
   void addToken(Token token) {
     if (token === null) return;
     add(token.value);
     if (token.kind === KEYWORD_TOKEN || token.kind === IDENTIFIER_TOKEN) {
       sb.add(' ');
     }
   }
 
   unparse(Node node) { visit(node); }
 
   visit(Node node) {
-    if (node === null) return;
-    String renamed = rename(node);
-    if (renamed !== null) {
-      sb.add(renamed);
-    } else {
-      // Fallback.
-      node.accept(this);
-    }
+    if (node !== null) node.accept(this);
   }
 
   visitBlock(Block node) {
     visit(node.statements);
   }
 
   visitCascade(Cascade node) {
     visit(node.expression);
   }
 
@@ skipping 194 matching lines @@
   visitReturn(Return node) {
     add(node.beginToken.value);
     if (node.hasExpression && node.beginToken.stringValue != '=>') {
       sb.add(' ');
     }
     visit(node.expression);
     if (node.endToken !== null) add(node.endToken.value);
   }
 
   unparseSendReceiver(Send node, [bool spacesNeeded=false]) {
-    // TODO(smok): Remove ugly hack for library preferences.
-    // Check that renamer does not want to omit receiver at all,
-    // in that case we don't need spaces or dot.
-    if (node.receiver !== null && rename(node.receiver) != '') {
-      visit(node.receiver);
-      CascadeReceiver asCascadeReceiver = node.receiver.asCascadeReceiver();
-      if (asCascadeReceiver !== null) {
-        add(asCascadeReceiver.cascadeOperator.value);
-      } else if (node.selector.asOperator() === null) {
-        sb.add('.');
-      } else if (spacesNeeded) {
-        sb.add(' ');
-      }
+    if (node.receiver === null) return;
+    visit(node.receiver);
+    CascadeReceiver asCascadeReceiver = node.receiver.asCascadeReceiver();
+    if (asCascadeReceiver !== null) {
+      add(asCascadeReceiver.cascadeOperator.value);
+    } else if (node.selector.asOperator() === null) {
+      sb.add('.');
+    } else if (spacesNeeded) {
+      sb.add(' ');
     }
   }
 
   visitSend(Send node) {
     Operator op = node.selector.asOperator();
     bool spacesNeeded = op !== null &&
         (op.source.stringValue === 'is' || op.source.stringValue == 'as');
 
     if (node.isPrefix) visit(node.selector);
     unparseSendReceiver(node, spacesNeeded: spacesNeeded);
@@ skipping 222 matching lines @@
       sb.add(' ');
     }
     visit(node.name);
     if (node.typeParameters !== null) {
       visit(node.typeParameters);
     }
     visit(node.formals);
     add(node.endToken.value);
   }
 }