Seek first bytes lengths before seek bits for __deku_input #502
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
Benchmark for 78ed86bClick to view benchmark
|
deku-derive/src/macros/deku_read.rs
Outdated
| if bytes != 0 { | ||
| use ::#crate_::no_std_io::Seek; | ||
| use ::#crate_::no_std_io::SeekFrom; | ||
| if let Err(e) = __deku_reader.seek(SeekFrom::Current(i64::try_from(bytes).unwrap())) { |
There was a problem hiding this comment.
should we handle the error from i64::try_from? else we should expect instead of unwrap
There was a problem hiding this comment.
Yah, the seek_* code has the same problem.
deku-derive/src/macros/deku_read.rs
Outdated
| if bytes != 0 { | ||
| use ::#crate_::no_std_io::Seek; | ||
| use ::#crate_::no_std_io::SeekFrom; | ||
| if let Err(e) = __deku_reader.seek(SeekFrom::Current(i64::try_from(bytes).unwrap())) { |
There was a problem hiding this comment.
same here (edit: and a couple more spots in the code)
deku-derive/src/macros/deku_read.rs
Outdated
| @@ -121,9 +131,19 @@ fn emit_struct(input: &DekuData) -> Result<TokenStream, syn::Error> { | |||
| use ::#crate_::DekuReader as _; | |||
| let mut __deku_cursor = #crate_::no_std_io::Cursor::new(__deku_input.0); | |||
| let mut __deku_reader = &mut deku::reader::Reader::new(&mut __deku_cursor); | |||
| if __deku_input.1 != 0 { | |||
| __deku_reader.skip_bits(__deku_input.1)?; | |||
| let bytes = __deku_input.1 / 8; | |||
There was a problem hiding this comment.
I see this section is being repeated, worth having an emit_.. function for this new chunk?
There was a problem hiding this comment.
I was thinking that also, it's weird to codegen this code over and over again instead of something in the reader.
There was a problem hiding this comment.
Updated, I forgot skip_bits was already only used for this.
* For bits input into from_bytes, first seek the byte amount until we can seek the bits amount Closes #500
wcampbell0x2a
force-pushed
the
seek-first-when-deku-input-has-bits
branch
from
ec07517
to
a8f31d1
Compare
Benchmark for ba10dc8Click to view benchmark
|
Benchmark for 6d8d88aClick to view benchmark
|
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.
Closes #500