Make LangID optional on get_string() #140
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
src/device.rs
Outdated
| @@ -599,7 +602,7 @@ impl<B: UsbBus> UsbDevice<'_, B> { | |||
| let index = StringIndex::new(index); | |||
| classes | |||
| .iter() | |||
| .find_map(|cls| cls.get_string(index, lang_id)) | |||
| .find_map(|cls| cls.get_string(index, lang_id.ok())) | |||
There was a problem hiding this comment.
I think defaulting to EN_US for the lang ID is probably a good idea. I don't think Lang ID is even defined in the USB spec anymore.
jose-acevedoflores
force-pushed
the
jose/lang_id_optional
branch
from
1111f49
to
55aecdd
Compare
|
Made the change to just use |
|
Wonderful, thanks for the PR! :) |
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've been playing around with the Microsoft OS String Descriptors (specifically to get the winusb driver installed on my device) and everything was working fine on 0.2.9 but the update to 0.3.0 (#122) introduced a behavior difference.
The change in #122 requires that
req.indexbe a valid lang id, if not, it exits early and doesn't call theget_stringmethod.I also thought lang id could be set to a default in order to not get a breaking change but I think it obscures that LangId might not be set for all requests?
Any thoughts appreciated. I'm just dabbling on embedded stuff so I could be missing something.