Fix accidentally quadratic algorithm #102
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
| @@ -409,7 +409,7 @@ fn line_numbers() { | |||
| assert_eq!(input.next_including_whitespace(), Ok(Token::Ident(Borrowed("foo")))); | |||
| assert_eq!(input.current_source_location(), SourceLocation { line: 1, column: 4 }); | |||
| assert_eq!(input.next_including_whitespace(), Ok(Token::WhiteSpace(" "))); | |||
| assert_eq!(input.current_source_location(), SourceLocation { line: 1, column: 5 }); | |||
| // assert_eq!(input.current_source_location(), SourceLocation { line: 1, column: 5 }); | |||
There was a problem hiding this comment.
Remove or keep, but don't comment it out.
There was a problem hiding this comment.
Ah, yes, I didn’t mean to commit that. Reverted.
|
@bors-servo: r+ |
|
📌 Commit d1eefdf has been approved by |
bors-servo
pushed a commit
that referenced
this pull request
Mar 9, 2016
Fix accidentally quadratic algorithm `Tokenize::source_location` takes an "position" counting UTF-8 bytes since the start of the stylesheet and returns a "location" made of a line number and column number. To avoid counting lines from the start every time, it saves some results after each call. Previously we would only save the position of the last known line break, so calling source_location() for name positions within a single long line would keep searching from that point for the next line break and therefore take O(n²) time. Very long lines can easily happen when a CSS minifier is used. We now save the full (line, column) result from the last call. See servo/servo#9897 (comment) and servo/servo#9897 (comment) r? @jdm <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/rust-cssparser/102) <!-- Reviewable:end -->
|
💔 Test failed - travis |
|
☔ The latest upstream changes (presumably #99) made this pull request unmergeable. Please resolve the merge conflicts. |
Previously we would only save the position of the last known line break, so calling source_location() for name positions within a single long line would keep searching from that point for the next line break and therefore take O(n²) time. We now save the full (line, column) result from the last call. servo/servo#9897 (comment) servo/servo#9897 (comment)
|
Rebased. @bors-servo r=jdm Previous failure was |
|
📌 Commit 375ad58 has been approved by |
bors-servo
pushed a commit
that referenced
this pull request
Mar 19, 2016
Fix accidentally quadratic algorithm `Tokenize::source_location` takes an "position" counting UTF-8 bytes since the start of the stylesheet and returns a "location" made of a line number and column number. To avoid counting lines from the start every time, it saves some results after each call. Previously we would only save the position of the last known line break, so calling source_location() for name positions within a single long line would keep searching from that point for the next line break and therefore take O(n²) time. Very long lines can easily happen when a CSS minifier is used. We now save the full (line, column) result from the last call. See servo/servo#9897 (comment) and servo/servo#9897 (comment) r? @jdm <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/rust-cssparser/102) <!-- Reviewable:end -->
|
☀️ Test successful - travis |
|
Published v0.5.5 on crates.io |
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.
Tokenize::source_locationtakes an "position" counting UTF-8 bytes since the start of the stylesheet and returns a "location" made of a line number and column number. To avoid counting lines from the start every time, it saves some results after each call.Previously we would only save the position of the last known line break, so calling source_location() for name positions within a single long line would keep searching from that point for the next line break and therefore take O(n²) time.
Very long lines can easily happen when a CSS minifier is used.
We now save the full (line, column) result from the last call.
See servo/servo#9897 (comment) and servo/servo#9897 (comment)
r? @jdm
This change is