add *_with_custom_entities versions of all `unescape_*\ methods
#261
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
these versions expect an additional parameter: a hashmap containing custom entity definitions. A typical use-case is for the user to parse those entities definitions from the DOCTYPE. An example is provided: examples/custom_entities.rs .
This was referenced Feb 8, 2021
tafia
requested changes
Feb 9, 2021
src/escapei.rs
Outdated
| parse_hexadecimal(&bytes[2..]) | ||
| } else if bytes.starts_with(b"#") { | ||
| parse_decimal(&bytes[1..]) | ||
| bytes if bytes[0] == b'#' => { |
There was a problem hiding this comment.
bytes if bytes.starts_with(b'#')(to accommodate when bytes is empty)
src/escapei.rs
Outdated
| parse_hexadecimal(&bytes[2..]) | ||
| } else if bytes.starts_with(b"#") { | ||
| parse_decimal(&bytes[1..]) | ||
| bytes if bytes[0] == b'#' => { |
| let decoded = reader.decode(&*self.value); | ||
| let unescaped = | ||
| unescape_with(decoded.as_bytes(), custom_entities).map_err(Error::EscapeError)?; | ||
| String::from_utf8(unescaped.into_owned()).map_err(|e| Error::Utf8(e.utf8_error())) |
There was a problem hiding this comment.
Are we sure it'll be utf8? Shouldn't we use the reader.decode instead?
There was a problem hiding this comment.
I lean towards keeping things simple: what about requiring that custom_entities contains UTF-8?
|
About making the code more DRY: yes, I would be better, but I wanted to test the idea with you before refactoring... I'll go make the change (as well as your comments above). |
tafia
approved these changes
Feb 10, 2021
| let decoded = reader.decode(&*self.value); | ||
| let unescaped = | ||
| unescape_with(decoded.as_bytes(), custom_entities).map_err(Error::EscapeError)?; | ||
| String::from_utf8(unescaped.into_owned()).map_err(|e| Error::Utf8(e.utf8_error())) |
Closed
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.
these versions expect an additional parameter:
a hashmap containing custom entity definitions.
A typical use-case is for the user to parse those entities definitions
from the DOCTYPE.
An example is provided: examples/custom_entities.rs .