minor refactor: use built-in option methods instead of try_for_opt! macro
#140
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
RazrFalcon
reviewed
Feb 7, 2024
src/tables/gvar.rs
Outdated
| if target_sub.or(next_sub).is_none() { | ||
| return 0.0; | ||
| }; | ||
| let d = f32::from(target_sub.unwrap()) / f32::from(next_sub.unwrap()); |
There was a problem hiding this comment.
I would prefer:
let d = if let (Some(target_sub), Some(next_sub)) = (target_sub, next_sub) {
f32::from(target_sub) / f32::from(next_sub)
} else {
return 0.0
};
|
Thanks! That's a good change. I do not like using macros in general. Those are just some old left-overs. |
|
Looks like you have removed your |
The `try_opt_or!` macro slightly shortened some
`map(...).unwrap_or(...)` logic in `./lib.rs`, and
some longer `if _.is_none() { return }` logic in
`./tables/gvar.rs`. I had to do some code searching
to figure out what `try_opt_or!` did, so I refactored
it for my own comprension.
SKalt
force-pushed
the
deprecate-try_opt_or-macro
branch
from
e04cffa
to
b29093d
Compare
|
Whoops. I fixed that and rebased my changes into a single commit, which I re-checked with |
|
All good. Thanks! |
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 was reading through the code and had to check what
try_for_opt!did. I factored the macro into built-in option methods to improve my comprehension of the code. I recognize this is a minor refactor that wasn't requested; please feel free to close this PR if it's too minor or it decreases readability.In any case, thanks for writing
ttf-parser! I'm enjoying using it.