Auto merge of #17877 - canaltinova:font-face-refactoring, r=jdm

Cleanup @font-face rule constructor

Passing SourceLocation into constructor instead of assigning
immediately after construction cleans up the code and helps to
prevent leaving an invalid SourceLocation in the future.

- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors

<!-- Either: -->
- [X] These changes do not require tests because it's just a cleanup.

<!-- 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/17877)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-07-26 14:13:02 -05:00 committed by GitHub
commit a15d13a6ec

View file

@ -110,8 +110,7 @@ impl Parse for FontWeight {
/// Note that the prelude parsing code lives in the `stylesheets` module. /// Note that the prelude parsing code lives in the `stylesheets` module.
pub fn parse_font_face_block(context: &ParserContext, input: &mut Parser, location: SourceLocation) pub fn parse_font_face_block(context: &ParserContext, input: &mut Parser, location: SourceLocation)
-> FontFaceRuleData { -> FontFaceRuleData {
let mut rule = FontFaceRuleData::empty(); let mut rule = FontFaceRuleData::empty(location);
rule.source_location = location;
{ {
let parser = FontFaceRuleParser { let parser = FontFaceRuleParser {
context: context, context: context,
@ -229,15 +228,12 @@ macro_rules! font_face_descriptors_common {
} }
impl FontFaceRuleData { impl FontFaceRuleData {
fn empty() -> Self { fn empty(location: SourceLocation) -> Self {
FontFaceRuleData { FontFaceRuleData {
$( $(
$ident: None, $ident: None,
)* )*
source_location: SourceLocation { source_location: location,
line: 0,
column: 0,
},
} }
} }