Ability to create Bytes shader function #6
Conversation
joan38
force-pushed
the
iterable
branch
2 times, most recently
from
15d96b4
to
6a422dd
Compare
joan38
changed the title
joan38
force-pushed
the
iterable
branch
3 times, most recently
from
8ae6e73
to
479b3f6
Compare
joan38
changed the title
There was a problem hiding this comment.
I opened #7, that includes the changes here, to address the comments I added.
| (inputStream, mapping) => | ||
| if (rules.isEmpty) Some(inputStream -> mapping) | ||
| else { | ||
| bytcodeShader(rules, verbose)(readAllBytes(inputStream), mapping).map { case (bytes, newMapping) => |
There was a problem hiding this comment.
The bytcodeShader(rules, verbose) can be factored, to avoid re-converting the rules.
| if (rules.isEmpty) Some(inputStream -> mapping) | ||
| else { | ||
| bytcodeShader(rules, verbose)(readAllBytes(inputStream), mapping).map { case (bytes, newMapping) => | ||
| new ByteArrayInputStream(bytes) { override def close(): Unit = inputStream.close() } -> newMapping |
There was a problem hiding this comment.
Why close inputStream via this one? I'm not sure that makes sense, as inputStream is read before that (via readAllBytes(inputStream)).
There was a problem hiding this comment.
Don't we need to maintain the close chain? Otherwise we risk of leaving open InputStream.
| val shadedInputStream = | ||
| if (proc.process(entry)) Some(entry.data -> entry.name) | ||
| else None | ||
| shadedInputStream.filterNot(a => excludes.contains(a._2)) |
There was a problem hiding this comment.
That condition can be pushed down, so that proc.process isn't called.
joan38
changed the title
|
Alright, so we are good to go with this version @eed3si9n @alexarchambault ? |
|
I'll defer to Alex's review, and merge. |
|
https://github.com/eed3si9n/jarjar-abrams/releases/tag/v0.3.0 on its way to Maven Central. |
|
Thanks @eed3si9n |
Related to the discussion in com-lihaoyi/mill#947 (comment)