From 0d7b0d0827e141d824369ac740429e59f1823886 Mon Sep 17 00:00:00 2001
From: Guillaume Martres <smarter@ubuntu.com>
Date: Sun, 14 Jan 2018 01:07:31 +0100
Subject: [PATCH] Revert changes to ZipArchive

ZipArchive comes from scalac but was modified because the local class
failed to be pickled correctly previously. This appear to be fixed now,
so we can close #2340.
---
 compiler/src/dotty/tools/io/ZipArchive.scala | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/compiler/src/dotty/tools/io/ZipArchive.scala b/compiler/src/dotty/tools/io/ZipArchive.scala
index d83fd230f0a6..57657a2ebb6f 100644
--- a/compiler/src/dotty/tools/io/ZipArchive.scala
+++ b/compiler/src/dotty/tools/io/ZipArchive.scala
@@ -205,11 +205,12 @@ final class ManifestResources(val url: URL) extends ZipArchive(null) {
     for (zipEntry <- iter) {
       val dir = getDir(dirs, zipEntry)
       if (!zipEntry.isDirectory) {
-        val f = new Entry(zipEntry.getName) {
+        class FileEntry() extends Entry(zipEntry.getName) {
           override def lastModified = zipEntry.getTime()
           override def input        = resourceInputStream(path)
           override def sizeOption   = None
         }
+        val f = new FileEntry()
         dir.entries(f.name) = f
       }
     }