Bug 1468651: Rename the properties directories from "shorthand" to "shorthands", "longhand" to "longhands". r=heycam
authorEmilio Cobos Álvarez <emilio@crisal.io>
Tue, 19 Jun 2018 13:05:25 +0200
changeset 423042 6b23758e71d03125e235132b2f25750f9a577800
parent 423041 e3b98fb8b7131f4c77073f2d3c4a5cafe93be00b
child 423043 005dba89ec04a2ad58868a2a6485f3e2f47d91c9
push id104452
push useremilio@crisal.io
push dateWed, 20 Jun 2018 09:27:29 +0000
treeherdermozilla-inbound@471c301d3de6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersheycam
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: Rename the properties directories from "shorthand" to "shorthands", "longhand" to "longhands". r=heycam MozReview-Commit-ID: CY4THCC4zkX
servo/components/style/properties/longhand/background.mako.rs
servo/components/style/properties/longhand/border.mako.rs
servo/components/style/properties/longhand/box.mako.rs
servo/components/style/properties/longhand/color.mako.rs
servo/components/style/properties/longhand/column.mako.rs
servo/components/style/properties/longhand/counters.mako.rs
servo/components/style/properties/longhand/effects.mako.rs
servo/components/style/properties/longhand/font.mako.rs
servo/components/style/properties/longhand/inherited_box.mako.rs
servo/components/style/properties/longhand/inherited_svg.mako.rs
servo/components/style/properties/longhand/inherited_table.mako.rs
servo/components/style/properties/longhand/inherited_text.mako.rs
servo/components/style/properties/longhand/inherited_ui.mako.rs
servo/components/style/properties/longhand/list.mako.rs
servo/components/style/properties/longhand/margin.mako.rs
servo/components/style/properties/longhand/outline.mako.rs
servo/components/style/properties/longhand/padding.mako.rs
servo/components/style/properties/longhand/position.mako.rs
servo/components/style/properties/longhand/svg.mako.rs
servo/components/style/properties/longhand/table.mako.rs
servo/components/style/properties/longhand/text.mako.rs
servo/components/style/properties/longhand/ui.mako.rs
servo/components/style/properties/longhand/xul.mako.rs
servo/components/style/properties/longhands/background.mako.rs
servo/components/style/properties/longhands/border.mako.rs
servo/components/style/properties/longhands/box.mako.rs
servo/components/style/properties/longhands/color.mako.rs
servo/components/style/properties/longhands/column.mako.rs
servo/components/style/properties/longhands/counters.mako.rs
servo/components/style/properties/longhands/effects.mako.rs
servo/components/style/properties/longhands/font.mako.rs
servo/components/style/properties/longhands/inherited_box.mako.rs
servo/components/style/properties/longhands/inherited_svg.mako.rs
servo/components/style/properties/longhands/inherited_table.mako.rs
servo/components/style/properties/longhands/inherited_text.mako.rs
servo/components/style/properties/longhands/inherited_ui.mako.rs
servo/components/style/properties/longhands/list.mako.rs
servo/components/style/properties/longhands/margin.mako.rs
servo/components/style/properties/longhands/outline.mako.rs
servo/components/style/properties/longhands/padding.mako.rs
servo/components/style/properties/longhands/position.mako.rs
servo/components/style/properties/longhands/svg.mako.rs
servo/components/style/properties/longhands/table.mako.rs
servo/components/style/properties/longhands/text.mako.rs
servo/components/style/properties/longhands/ui.mako.rs
servo/components/style/properties/longhands/xul.mako.rs
servo/components/style/properties/properties.mako.rs
servo/components/style/properties/shorthand/background.mako.rs
servo/components/style/properties/shorthand/border.mako.rs
servo/components/style/properties/shorthand/box.mako.rs
servo/components/style/properties/shorthand/column.mako.rs
servo/components/style/properties/shorthand/font.mako.rs
servo/components/style/properties/shorthand/inherited_svg.mako.rs
servo/components/style/properties/shorthand/inherited_text.mako.rs
servo/components/style/properties/shorthand/list.mako.rs
servo/components/style/properties/shorthand/margin.mako.rs
servo/components/style/properties/shorthand/mask.mako.rs
servo/components/style/properties/shorthand/outline.mako.rs
servo/components/style/properties/shorthand/padding.mako.rs
servo/components/style/properties/shorthand/position.mako.rs
servo/components/style/properties/shorthand/text.mako.rs
servo/components/style/properties/shorthands/background.mako.rs
servo/components/style/properties/shorthands/border.mako.rs
servo/components/style/properties/shorthands/box.mako.rs
servo/components/style/properties/shorthands/column.mako.rs
servo/components/style/properties/shorthands/font.mako.rs
servo/components/style/properties/shorthands/inherited_svg.mako.rs
servo/components/style/properties/shorthands/inherited_text.mako.rs
servo/components/style/properties/shorthands/list.mako.rs
servo/components/style/properties/shorthands/margin.mako.rs
servo/components/style/properties/shorthands/mask.mako.rs
servo/components/style/properties/shorthands/outline.mako.rs
servo/components/style/properties/shorthands/padding.mako.rs
servo/components/style/properties/shorthands/position.mako.rs
servo/components/style/properties/shorthands/text.mako.rs
rename from servo/components/style/properties/longhand/background.mako.rs
rename to servo/components/style/properties/longhands/background.mako.rs
rename from servo/components/style/properties/longhand/border.mako.rs
rename to servo/components/style/properties/longhands/border.mako.rs
rename from servo/components/style/properties/longhand/box.mako.rs
rename to servo/components/style/properties/longhands/box.mako.rs
rename from servo/components/style/properties/longhand/color.mako.rs
rename to servo/components/style/properties/longhands/color.mako.rs
rename from servo/components/style/properties/longhand/column.mako.rs
rename to servo/components/style/properties/longhands/column.mako.rs
rename from servo/components/style/properties/longhand/counters.mako.rs
rename to servo/components/style/properties/longhands/counters.mako.rs
rename from servo/components/style/properties/longhand/effects.mako.rs
rename to servo/components/style/properties/longhands/effects.mako.rs
rename from servo/components/style/properties/longhand/font.mako.rs
rename to servo/components/style/properties/longhands/font.mako.rs
rename from servo/components/style/properties/longhand/inherited_box.mako.rs
rename to servo/components/style/properties/longhands/inherited_box.mako.rs
rename from servo/components/style/properties/longhand/inherited_svg.mako.rs
rename to servo/components/style/properties/longhands/inherited_svg.mako.rs
rename from servo/components/style/properties/longhand/inherited_table.mako.rs
rename to servo/components/style/properties/longhands/inherited_table.mako.rs
rename from servo/components/style/properties/longhand/inherited_text.mako.rs
rename to servo/components/style/properties/longhands/inherited_text.mako.rs
rename from servo/components/style/properties/longhand/inherited_ui.mako.rs
rename to servo/components/style/properties/longhands/inherited_ui.mako.rs
rename from servo/components/style/properties/longhand/list.mako.rs
rename to servo/components/style/properties/longhands/list.mako.rs
rename from servo/components/style/properties/longhand/margin.mako.rs
rename to servo/components/style/properties/longhands/margin.mako.rs
rename from servo/components/style/properties/longhand/outline.mako.rs
rename to servo/components/style/properties/longhands/outline.mako.rs
rename from servo/components/style/properties/longhand/padding.mako.rs
rename to servo/components/style/properties/longhands/padding.mako.rs
rename from servo/components/style/properties/longhand/position.mako.rs
rename to servo/components/style/properties/longhands/position.mako.rs
rename from servo/components/style/properties/longhand/svg.mako.rs
rename to servo/components/style/properties/longhands/svg.mako.rs
rename from servo/components/style/properties/longhand/table.mako.rs
rename to servo/components/style/properties/longhands/table.mako.rs
rename from servo/components/style/properties/longhand/text.mako.rs
rename to servo/components/style/properties/longhands/text.mako.rs
rename from servo/components/style/properties/longhand/ui.mako.rs
rename to servo/components/style/properties/longhands/ui.mako.rs
rename from servo/components/style/properties/longhand/xul.mako.rs
rename to servo/components/style/properties/longhands/xul.mako.rs
--- a/servo/components/style/properties/properties.mako.rs
+++ b/servo/components/style/properties/properties.mako.rs
@@ -92,39 +92,39 @@ macro_rules! expanded {
             )+
         }
     }
 }
 
 /// A module with all the code for longhand properties.
 #[allow(missing_docs)]
 pub mod longhands {
-    <%include file="/longhand/background.mako.rs" />
-    <%include file="/longhand/border.mako.rs" />
-    <%include file="/longhand/box.mako.rs" />
-    <%include file="/longhand/color.mako.rs" />
-    <%include file="/longhand/column.mako.rs" />
-    <%include file="/longhand/counters.mako.rs" />
-    <%include file="/longhand/effects.mako.rs" />
-    <%include file="/longhand/font.mako.rs" />
-    <%include file="/longhand/inherited_box.mako.rs" />
-    <%include file="/longhand/inherited_table.mako.rs" />
-    <%include file="/longhand/inherited_text.mako.rs" />
-    <%include file="/longhand/inherited_ui.mako.rs" />
-    <%include file="/longhand/list.mako.rs" />
-    <%include file="/longhand/margin.mako.rs" />
-    <%include file="/longhand/outline.mako.rs" />
-    <%include file="/longhand/padding.mako.rs" />
-    <%include file="/longhand/position.mako.rs" />
-    <%include file="/longhand/table.mako.rs" />
-    <%include file="/longhand/text.mako.rs" />
-    <%include file="/longhand/ui.mako.rs" />
-    <%include file="/longhand/inherited_svg.mako.rs" />
-    <%include file="/longhand/svg.mako.rs" />
-    <%include file="/longhand/xul.mako.rs" />
+    <%include file="/longhands/background.mako.rs" />
+    <%include file="/longhands/border.mako.rs" />
+    <%include file="/longhands/box.mako.rs" />
+    <%include file="/longhands/color.mako.rs" />
+    <%include file="/longhands/column.mako.rs" />
+    <%include file="/longhands/counters.mako.rs" />
+    <%include file="/longhands/effects.mako.rs" />
+    <%include file="/longhands/font.mako.rs" />
+    <%include file="/longhands/inherited_box.mako.rs" />
+    <%include file="/longhands/inherited_table.mako.rs" />
+    <%include file="/longhands/inherited_text.mako.rs" />
+    <%include file="/longhands/inherited_ui.mako.rs" />
+    <%include file="/longhands/list.mako.rs" />
+    <%include file="/longhands/margin.mako.rs" />
+    <%include file="/longhands/outline.mako.rs" />
+    <%include file="/longhands/padding.mako.rs" />
+    <%include file="/longhands/position.mako.rs" />
+    <%include file="/longhands/table.mako.rs" />
+    <%include file="/longhands/text.mako.rs" />
+    <%include file="/longhands/ui.mako.rs" />
+    <%include file="/longhands/inherited_svg.mako.rs" />
+    <%include file="/longhands/svg.mako.rs" />
+    <%include file="/longhands/xul.mako.rs" />
 }
 
 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()));
 }
 
@@ -158,30 +158,30 @@ pub mod shorthands {
         style.to_css(dest)?;
         if *color != Color::CurrentColor {
             dest.write_str(" ")?;
             color.to_css(dest)?;
         }
         Ok(())
     }
 
-    <%include file="/shorthand/background.mako.rs" />
-    <%include file="/shorthand/border.mako.rs" />
-    <%include file="/shorthand/box.mako.rs" />
-    <%include file="/shorthand/column.mako.rs" />
-    <%include file="/shorthand/font.mako.rs" />
-    <%include file="/shorthand/inherited_text.mako.rs" />
-    <%include file="/shorthand/list.mako.rs" />
-    <%include file="/shorthand/margin.mako.rs" />
-    <%include file="/shorthand/mask.mako.rs" />
-    <%include file="/shorthand/outline.mako.rs" />
-    <%include file="/shorthand/padding.mako.rs" />
-    <%include file="/shorthand/position.mako.rs" />
-    <%include file="/shorthand/inherited_svg.mako.rs" />
-    <%include file="/shorthand/text.mako.rs" />
+    <%include file="/shorthands/background.mako.rs" />
+    <%include file="/shorthands/border.mako.rs" />
+    <%include file="/shorthands/box.mako.rs" />
+    <%include file="/shorthands/column.mako.rs" />
+    <%include file="/shorthands/font.mako.rs" />
+    <%include file="/shorthands/inherited_text.mako.rs" />
+    <%include file="/shorthands/list.mako.rs" />
+    <%include file="/shorthands/margin.mako.rs" />
+    <%include file="/shorthands/mask.mako.rs" />
+    <%include file="/shorthands/outline.mako.rs" />
+    <%include file="/shorthands/padding.mako.rs" />
+    <%include file="/shorthands/position.mako.rs" />
+    <%include file="/shorthands/inherited_svg.mako.rs" />
+    <%include file="/shorthands/text.mako.rs" />
 
     // We don't defined 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:
     //
     //   https://bugzilla.mozilla.org/show_bug.cgi?id=1410028
rename from servo/components/style/properties/shorthand/background.mako.rs
rename to servo/components/style/properties/shorthands/background.mako.rs
rename from servo/components/style/properties/shorthand/border.mako.rs
rename to servo/components/style/properties/shorthands/border.mako.rs
rename from servo/components/style/properties/shorthand/box.mako.rs
rename to servo/components/style/properties/shorthands/box.mako.rs
rename from servo/components/style/properties/shorthand/column.mako.rs
rename to servo/components/style/properties/shorthands/column.mako.rs
rename from servo/components/style/properties/shorthand/font.mako.rs
rename to servo/components/style/properties/shorthands/font.mako.rs
rename from servo/components/style/properties/shorthand/inherited_svg.mako.rs
rename to servo/components/style/properties/shorthands/inherited_svg.mako.rs
rename from servo/components/style/properties/shorthand/inherited_text.mako.rs
rename to servo/components/style/properties/shorthands/inherited_text.mako.rs
rename from servo/components/style/properties/shorthand/list.mako.rs
rename to servo/components/style/properties/shorthands/list.mako.rs
rename from servo/components/style/properties/shorthand/margin.mako.rs
rename to servo/components/style/properties/shorthands/margin.mako.rs
rename from servo/components/style/properties/shorthand/mask.mako.rs
rename to servo/components/style/properties/shorthands/mask.mako.rs
rename from servo/components/style/properties/shorthand/outline.mako.rs
rename to servo/components/style/properties/shorthands/outline.mako.rs
rename from servo/components/style/properties/shorthand/padding.mako.rs
rename to servo/components/style/properties/shorthands/padding.mako.rs
rename from servo/components/style/properties/shorthand/position.mako.rs
rename to servo/components/style/properties/shorthands/position.mako.rs
rename from servo/components/style/properties/shorthand/text.mako.rs
rename to servo/components/style/properties/shorthands/text.mako.rs