1 files changed, 7 insertions, 22 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/Printer.java b/src/main/java/com/google/devtools/build/lib/syntax/Printer.java
index 46ccc55763..2586306bf0 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/Printer.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/Printer.java
@@ -158,27 +158,12 @@ public final class Printer {
     } else if (o instanceof Label) {
       write(buffer, o.toString(), quotationMark);
 
-    } else if (o instanceof FilesetEntry) {
-           FilesetEntry entry = (FilesetEntry) o;
-      append(buffer, "FilesetEntry(srcdir = ");
-      write(buffer, entry.getSrcLabel().toString(), quotationMark);
-      append(buffer, ", files = ");
-      write(buffer, makeStringList(entry.getFiles()), quotationMark);
-      append(buffer, ", excludes = ");
-      write(buffer, makeList(entry.getExcludes()), quotationMark);
-      append(buffer, ", destdir = ");
-      write(buffer, entry.getDestDir().getPathString(), quotationMark);
-      append(buffer, ", strip_prefix = ");
-      write(buffer, entry.getStripPrefix(), quotationMark);
-      append(buffer, ", symlinks = ");
-      append(buffer, quotationMark);
-      append(buffer, entry.getSymlinkBehavior().toString());
-      append(buffer, quotationMark);
-      append(buffer, ")");
-
     } else if (o instanceof PathFragment) {
       append(buffer, ((PathFragment) o).getPathString());
 
+    } else if (o instanceof SkylarkValue) {
+      ((SkylarkValue) o).write(buffer, quotationMark);
+
     } else {
       append(buffer, o.toString());
     }
@@ -206,7 +191,7 @@ public final class Printer {
   // Throughout this file, we transform IOException into AssertionError.
   // During normal operations, we only use in-memory Appendable-s that
   // cannot cause an IOException.
-  private static Appendable append(Appendable buffer, char c) {
+  public static Appendable append(Appendable buffer, char c) {
     try {
       return buffer.append(c);
     } catch (IOException e) {
@@ -214,7 +199,7 @@ public final class Printer {
     }
   }
 
-  private static Appendable append(Appendable buffer, CharSequence s) {
+  public static Appendable append(Appendable buffer, CharSequence s) {
     try {
       return buffer.append(s);
     } catch (IOException e) {
@@ -357,11 +342,11 @@ public final class Printer {
     return listString(list, before, separator, after, singletonTerminator, SKYLARK_QUOTATION_MARK);
   }
 
-  private static List<?> makeList(Collection<?> list) {
+  public static List<?> makeList(Collection<?> list) {
     return list == null ? Lists.newArrayList() : Lists.newArrayList(list);
   }
 
-  private static List<String> makeStringList(List<Label> labels) {
+  public static List<String> makeStringList(List<Label> labels) {
     if (labels == null) {
       return Collections.emptyList();
     }