Bug 1468651: followup: Fix windows build bustage. r=me CLOSED TREE
authorEmilio Cobos Álvarez <emilio@crisal.io>
Wed, 20 Jun 2018 12:09:55 +0200
changeset 423046 691fc2e78036cd69af39310da4266e31156f4ec1
parent 423045 471c301d3de67e8ffa78a69fc7e3101636ac91c4
child 423047 1e045c12a8fe10f10ea9a29020296e06dc1e65f7
push id104453
push useremilio@crisal.io
push dateWed, 20 Jun 2018 10:11:10 +0000
treeherdermozilla-inbound@691fc2e78036 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1468651
milestone62.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1468651: followup: Fix windows build bustage. r=me CLOSED TREE MozReview-Commit-ID: 9Xj5lMFG4Ab
servo/components/style/properties/properties.mako.rs
--- a/servo/components/style/properties/properties.mako.rs
+++ b/servo/components/style/properties/properties.mako.rs
@@ -93,17 +93,17 @@ macro_rules! expanded {
         }
     }
 }
 
 /// A module with all the code for longhand properties.
 #[allow(missing_docs)]
 pub mod longhands {
     % for style_struct in data.style_structs:
-    include!("${os.path.join(OUT_DIR, 'longhands/{}.rs'.format(style_struct.name_lower))}");
+    include!("${repr(os.path.join(OUT_DIR, 'longhands/{}.rs'.format(style_struct.name_lower)))[1:-1]}");
     % endfor
 }
 
 macro_rules! unwrap_or_initial {
     ($prop: ident) => (unwrap_or_initial!($prop, $prop));
     ($prop: ident, $expr: expr) =>
         ($expr.unwrap_or_else(|| $prop::get_initial_specified_value()));
 }
@@ -139,17 +139,17 @@ pub mod shorthands {
         if *color != Color::CurrentColor {
             dest.write_str(" ")?;
             color.to_css(dest)?;
         }
         Ok(())
     }
 
     % for style_struct in data.style_structs:
-    include!("${os.path.join(OUT_DIR, 'shorthands/{}.rs'.format(style_struct.name_lower))}");
+    include!("${repr(os.path.join(OUT_DIR, 'shorthands/{}.rs'.format(style_struct.name_lower)))[1:-1]}");
     % endfor
 
     // We didn't define the 'all' shorthand using the regular helpers:shorthand
     // mechanism, since it causes some very large types to be generated.
     //
     // Also, make sure logical properties appear before its physical
     // counter-parts, in order to prevent bugs like:
     //