Saturate if nth-child value is out of range #198
Merged
Conversation
This file contains hidden or 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
|
@bors-servo r+ |
|
📌 Commit 07332bb has been approved by |
bors-servo
pushed a commit
that referenced
this pull request
Sep 19, 2017
Saturate if nth-child value is out of range Reusing our tokenizer because it already saturates. There is no way to reliably get the error details from `"-12034".parse()`, since the error type is opaque and the description strings may change. This fixes https://bugzilla.mozilla.org/show_bug.cgi?id=1401016 A less risky but also less correct fix is to simply return an error when `.parse()` fails. r? @SimonSapin Don't land until I can get a try run; nth-child has weird tokenization rules that we need to respect here (which is why I'm creating a new tokenizer in the first place) <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/rust-cssparser/198) <!-- Reviewable:end -->
heycam
approved these changes
Sep 19, 2017
| fn parse_number_saturate(string: &str) -> Result<i32, ()> { | ||
| let mut input = ParserInput::new(string); | ||
| let mut parser = Parser::new(&mut input); | ||
| let int = if let Ok(&Token::Number {int_value: Some(int), ..}) |
There was a problem hiding this comment.
The structure here feels a little weird. How about:
let next = parser.next_including_whitespace_and_comments();
if let Ok(&Token::Number {int_value: Some(int), ..}) = next {
if !parser.is_exhausted() {
return Ok(int);
}
}
Err(())unless you're keen on having the Ok return at the end of the function. Either way, probably nicer to have a separate let next = ....
|
Can't check is_exhausted whilst the parser is mutably borrowed by the token
|
|
Lexical lifetimes strike again :) |
|
☀️ Test successful - status-travis |
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.
Reusing our tokenizer because it already saturates.
There is no way to reliably get the error details from
"-12034".parse(), since the error type is opaque and the description strings may change.This fixes https://bugzilla.mozilla.org/show_bug.cgi?id=1401016
A less risky but also less correct fix is to simply return an error when
.parse()fails.r? @SimonSapin
Don't land until I can get a try run; nth-child has weird tokenization rules that we need to respect here (which is why I'm creating a new tokenizer in the first place)
This change is