Resolve "xs:list deserialization does not split on all whitespace" #843
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
…rious types of possible delimiters.
adamreichold
reviewed
Feb 2, 2025
|
|
||
| loop { | ||
| let string = content.as_str(); | ||
| if string.is_empty() { | ||
| return Ok(None); | ||
| } | ||
| return match memchr(DELIMITER, string.as_bytes()) { | ||
|
|
||
| let first_delimiter = string.as_bytes().iter().position(|c| DELIMETERS.contains(c)); |
adamreichold
reviewed
Feb 2, 2025
| @@ -391,7 +393,7 @@ impl<'de, 'a> SeqAccess<'de> for ListIter<'de, 'a> { | |||
| // `content` started with a space, skip them all | |||
| Some(0) => { | |||
| // Skip all spaces | |||
| let start = string.as_bytes().iter().position(|ch| *ch != DELIMITER); | |||
| let start = string.as_bytes().iter().position(|c| !DELIMETERS.contains(c)); | |||
There was a problem hiding this comment.
Similar to the above, str::find also accepts a closure checking whether a character matches.
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
Changed DELIMITER (u8) into an array DELIMITERS (u8; 4) that holds 4 possible delimiters.
This was implemented with issue #839 in mind, so I covered the following whitespaces:
\t,\r,\n. It is fairly easy to include more if necessary.