style: Move font-weight outside of mako #19086
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
|
Heads up! This PR modifies the following files:
|
|
|
emilio
approved these changes
Nov 1, 2017
| FontWeight::Weight(weight) => weight, | ||
| FontWeight::Normal => computed::FontWeight::normal(), | ||
| FontWeight::Bold => computed::FontWeight::bold(), | ||
| FontWeight::Bolder => |
| } | ||
| } | ||
|
|
||
| impl Parse for FontWeight { |
There was a problem hiding this comment.
This is pre-existing, but it feels weird to use parse in a computed type, and this can be more efficient if implemented in the specified type directly.
|
|
||
| impl Parse for FontWeight { | ||
| fn parse<'i, 't>(context: &ParserContext, input: &mut Parser<'i, 't>) | ||
| -> Result<FontWeight, ParseError<'i>> { |
There was a problem hiding this comment.
nit: indentation should probably be fixed-up here.
| impl Parse for FontWeight { | ||
| fn parse<'i, 't>(context: &ParserContext, input: &mut Parser<'i, 't>) | ||
| -> Result<FontWeight, ParseError<'i>> { | ||
| let result = input.try(|input| { |
There was a problem hiding this comment.
This could just be something like:
Ok(match *input.next()? {
Token::Ident(ref ident) => {
match_ignore_ascii_case! { ident,
"normal" => FontWeight::Normal,
// ...
_ => return Err(input.new_custom_error(..)),
}
}
Token::Number { int_value: Some(value), .. } => {
computed::FontWeight::from_int(value)?;
}
})Which is clearer I think, and also more efficient.
Also, could you note that the grammar of this property intentionally doesn't support calc()?
|
@bors-servo r=emilio |
|
📌 Commit 285d8bb has been approved by |
highfive
added
S-awaiting-merge
bors-servo
pushed a commit
that referenced
this pull request
Nov 1, 2017
style: Move font-weight outside of mako <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes are apart of #19015 (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [X] These changes do not require tests because refactoring <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/19086) <!-- Reviewable:end -->
|
☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev |
highfive
removed
the
S-awaiting-merge
49 tasks
bors-servo
pushed a commit
that referenced
this pull request
Nov 2, 2017
style: Cleanup font-weight parsing. Followup for #19086 <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/19093) <!-- Reviewable:end -->
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.
./mach build -ddoes not report any errors./mach test-tidydoes not report any errorsThis change is