Auto merge of #12506 - servo:geckolib-win, r=larsbergstrom

bors-servo · web-flow · commit 592be355c5ab · 2016-07-19T07:05:21.000-07:00
Rewrite a line in geckolib's properties.mako.rs to fix the build on windows.  This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12506)
diff --git a/ports/geckolib/properties.mako.rs b/ports/geckolib/properties.mako.rs
@@ -401,8 +401,7 @@ impl Clone for ${style_struct.gecko_struct_name} {
 }
 
 // FIXME(bholley): Make bindgen generate Debug for all types.
-%if style_struct.gecko_ffi_name in "nsStyleBorder nsStyleDisplay nsStyleList nsStyleBackground "\
-                                    "nsStyleFont nsStyleSVGReset".split():
+%if style_struct.gecko_ffi_name in ("nsStyle" + x for x in "Border Display List Background Font SVGReset".split()):
 impl Debug for ${style_struct.gecko_struct_name} {
     // FIXME(bholley): Generate this.
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {

Original file line number	Diff line number	Diff line change
`@@ -401,8 +401,7 @@ impl Clone for ${style_struct.gecko_struct_name} {`
`401`	`401`	`}`
`402`	`402`
`403`	`403`	`// FIXME(bholley): Make bindgen generate Debug for all types.`
`404`		`-%if style_struct.gecko_ffi_name in "nsStyleBorder nsStyleDisplay nsStyleList nsStyleBackground "\`
`405`		`- "nsStyleFont nsStyleSVGReset".split():`
	`404`	`+%if style_struct.gecko_ffi_name in ("nsStyle" + x for x in "Border Display List Background Font SVGReset".split()):`
`406`	`405`	`impl Debug for ${style_struct.gecko_struct_name} {`
`407`	`406`	`// FIXME(bholley): Generate this.`
`408`	`407`	`fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {`