Kill reflect io #2313
Merged
Kill reflect io #2313
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Admittedly, I did not run this locally before pushing - jumping on a plane. Will amend. |
felixmulder
force-pushed
the
topic/kill-reflect-io
branch
2 times, most recently
from
77ca8d4 to
7de9410
Compare
|
Did still work, just gotta have a look at the failing tests now. |
felixmulder
force-pushed
the
topic/kill-reflect-io
branch
2 times, most recently
from
55d8db0 to
a055aad
Compare
|
@dotty-bot: could you recheck this PR, please? |
|
Sure thing, I got your back! ❤️ |
|
@odersky - I seem to have encountered an ordering problem. The test that fails - does not fail on different orderings. I.e. the legacy tests contain the same test This is the error: -- [E045] Syntax Error: /Users/fixel/Projects/dotty/compiler/../compiler/src/dotty/tools/dotc/classpath/ZipAndJarFileLookupFactory.scala:58:49
58 | override protected def createFileEntry(file: FileZipArchive#Entry): ClassFileEntryImpl = ClassFileEntryImpl(file)
| ^^^^^^^^^^^^^^
| cyclic reference involving class FileZipArchiveAnd here's the stacktrace: I'll try to minimize it as much as possible. |
|
It's enough with: |
|
Which in turn can be simplified to: // Foo.scala
import dotty.tools.io.FileZipArchive
trait Foo {
def bar(entry: FileZipArchive#Entry): Any
}compiled with: |
|
There's a further hint: |
|
You should try to get the stacktrace for that cyclicreference exception. |
|
Would also be nice if you could minimize it to something that can reproduced on master, that means taking |
|
I'll try that, in the meanwhile - here's the stacktrace from the unpickling: |
|
"Blocker": #2391 |
felixmulder
force-pushed
the
topic/kill-reflect-io
branch
from
a055aad to
9d89076
Compare
|
@smarter - would you mind reviewing? |
felixmulder
force-pushed
the
topic/kill-reflect-io
branch
from
9d89076 to
a7bec36
Compare
smarter
reviewed
May 8, 2017
| @@ -0,0 +1,410 @@ | |||
| /** Taken from the original implementation of WeakHashSet in scala-reflect | |||
There was a problem hiding this comment.
The commit message should include the hash of the version of scalac from which this file was taken.
| @@ -101,7 +101,7 @@ class ExtractDependencies extends Phase { | |||
| val classSegments = Path(ze.path).segments | |||
| binaryDependency(zipFile, className(classSegments)) | |||
| } | |||
| case pf: scala.reflect.io.PlainFile => | |||
| case pf: dotty.tools.io.PlainFile => | |||
There was a problem hiding this comment.
This could just be PlainFile now, it's imported.
smarter
approved these changes
May 8, 2017
| @@ -0,0 +1,114 @@ | |||
| /* __ *\ | |||
There was a problem hiding this comment.
The commit message should include the hash of the version of theses files you're importing. If it works, try importing the latest version from scala 2.12.
| @@ -274,12 +206,11 @@ final class ManifestResources(val url: URL) extends ZipArchive(null) { | |||
| for (zipEntry <- iter) { | |||
| val dir = getDir(dirs, zipEntry) | |||
| if (!zipEntry.isDirectory) { | |||
| class FileEntry() extends Entry(zipEntry.getName) { | |||
| val f = new Entry(zipEntry.getName) { | |||
There was a problem hiding this comment.
I think this change is no longer necessary now that #2282 got merged.
project/Build.scala
Outdated
| @@ -621,6 +621,7 @@ object Build { | |||
| settings( | |||
| publishArtifact := false, | |||
| parallelExecution in Test := false, | |||
| testOptions in Test += Tests.Argument(TestFrameworks.JUnit, "-a", "-v"), | |||
There was a problem hiding this comment.
What is this for? Could you leave a comment?
felixmulder
force-pushed
the
topic/kill-reflect-io
branch
from
a7bec36 to
1096a28
Compare
Previously, we would use `scala.reflect.io._` directly. The first part of abstracting away reflect is to kill this direct dependency.
felixmulder
force-pushed
the
topic/kill-reflect-io
branch
2 times, most recently
from
b505c29 to
ea59cb3
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I fixed the backend, inlined the sources. I still want to change one thing. I want to make the API private to Dotty - does that make sense?
I'd rather expose something else or only parts of it.