commit bd0c7bb0a7cb0e1c52265022e84cb5c7553f46dc
author Francois-Rene Rideau <tunes@google.com> Mon Sep 21 16:54:19 2015 +0000
committer Laszlo Csomor <laszlocsomor@google.com> Tue Sep 22 17:04:20 2015 +0000
tree 8b7c507105bbb71c2f755b6a1c95d7d22dadf7c9
parent 8cf9d8de9c92b8802f801cbba32e694908d3347f

Hush Environment#toString()

Don't print the contents of an Environment, it only confuses users.

--
MOS_MIGRATED_REVID=103554964

src/main/java/com/google/devtools/build/lib/syntax/Environment.java

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/Environment.java b/src/main/java/com/google/devtools/build/lib/syntax/Environment.java
index 266c2c7..c283157 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/Environment.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/Environment.java
@@ -158,14 +158,7 @@
 
     @Override
     public String toString() {
-      String prefix = "Frame";
-      StringBuilder sb = new StringBuilder();
-      for (Frame f = this; f != null; f = f.parent) {
-        Printer.formatTo(sb, "%s%s%r",
-            ImmutableList.<Object>of(prefix, f.mutability(), f.bindings));
-        prefix = "=>";
-      }
-      return sb.toString();
+      return String.format("<Frame%s>", mutability());
     }
   }
 
@@ -772,25 +765,7 @@
 
   @Override
   public String toString() {
-    StringBuilder out = new StringBuilder();
-    out.append("Environment(lexicalFrame=");
-    out.append(lexicalFrame);
-    out.append(", globalFrame=");
-    out.append(globalFrame);
-    out.append(", dynamicFrame=");
-    out.append(dynamicFrame);
-    out.append(", eventHandler.getClass()=");
-    out.append(eventHandler.getClass());
-    out.append(", importedExtensions=");
-    out.append(importedExtensions);
-    out.append(", isSkylark=");
-    out.append(isSkylark);
-    out.append(", fileContentHashCode=");
-    out.append(fileContentHashCode);
-    out.append(", isLoadingPhase=");
-    out.append(isLoadingPhase);
-    out.append(")");
-    return out.toString();
+    return String.format("<Environment%s>", mutability());
   }
 
   /**

src/test/java/com/google/devtools/build/lib/syntax/EnvironmentTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/syntax/EnvironmentTest.java b/src/test/java/com/google/devtools/build/lib/syntax/EnvironmentTest.java
index 0202124..36fc761 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/EnvironmentTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/EnvironmentTest.java
@@ -135,10 +135,7 @@
   public void testToString() throws Exception {
     update("subject", new StringLiteral("Hello, 'world'.", '\''));
     update("from", new StringLiteral("Java", '"'));
-    assertThat(getEnvironment().toString())
-        .startsWith("Environment(lexicalFrame=null, "
-            + "globalFrame=Frame[test]{\"from\": \"Java\", \"subject\": 'Hello, \\'world\\'.'}=>"
-            + "(BUILD){");
+    assertThat(getEnvironment().toString()).isEqualTo("<Environment[test]>");
   }
 
   @Test