Rewrite using winnow and fixed parse_tar
#1
Merged
Conversation
This file contains 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
|
Original PR: Berrysoft#2 |
`parse_tar` now break the iteration once it encounters `None` from `parse_entry` instead of using `Iterator::flatten`, which keeps going instead of breaking the loop. It also fixed `parse_entry_streaming` to treat eof as end of the archive file as per the spec. Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
|
Looks good at first glance, will look more in depth later this week |
|
cc @passcod in case you forgot this PR |
|
Yeah I've been flat out at work, didn't even really have a weekend. I'll do it over waitangi (coming weekend) |
passcod
approved these changes
Feb 11, 2024
| @@ -4,30 +4,31 @@ | |||
| //! ```no_run | |||
| //! # fn main() -> Result<(), Box<dyn std::error::Error>> { | |||
| //! let file = std::fs::read("foo.tar")?; | |||
| //! # fn parse(file: &[u8]) -> Result<(), Box<dyn std::error::Error + '_>> { | |||
| //! let (_, entries) = tar_parser2::parse_tar(&file[..])?; | |||
| //! let entries = tar_parser2::parse_tar(&mut &file[..]).map_err(|err| err.into_inner().unwrap())?; | |||
There was a problem hiding this comment.
given this is a fairly significant rewrite that we're not upstreaming, maybe we should rename to tar_parser3? or to binstall-tar-parser?
There was a problem hiding this comment.
I think tar-parser3 is a good name, having binstall- prefix makes it looks like a project only binstall can use.
|
Thank you for taking your time to review! |
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.
parse_tarnow break the iteration once it encountersNonefromparse_entryinstead of usingIterator::flatten, which keeps going instead of breaking the loop.It also fixed
parse_entry_streamingto treat eof as end of the archive file as per the spec.Why rewrite using
winnow?LocatedandStatefulStreamand any incomplete stream viaStreamPartialsimply by using genericsRelated blog post: