From 3a34b21b638e4395e708049a4d2d90b3c9ea432d Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Sat, 2 Sep 2017 10:56:23 +0200 Subject: [PATCH] Reformat another match expression --- .../style/properties/longhand/box.mako.rs | 105 +++++++++++++----- 1 file changed, 75 insertions(+), 30 deletions(-) diff --git a/components/style/properties/longhand/box.mako.rs b/components/style/properties/longhand/box.mako.rs index 55b7f100e64..8ac8f26e7f7 100644 --- a/components/style/properties/longhand/box.mako.rs +++ b/components/style/properties/longhand/box.mako.rs @@ -819,55 +819,100 @@ ${helpers.predefined_type( m11, m12, m13, m14, m21, m22, m23, m24, m31, m32, m33, m34, - m41, m42, m43, m44 } => write!( + m41, m42, m43, m44, + } => { + write!( dest, "matrix3d({}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {})", Css(m11), Css(m12), Css(m13), Css(m14), Css(m21), Css(m22), Css(m23), Css(m24), Css(m31), Css(m32), Css(m33), Css(m34), - Css(m41), Css(m42), Css(m43), Css(m44)), + Css(m41), Css(m42), Css(m43), Css(m44), + ) + } SpecifiedOperation::PrefixedMatrix3D { m11, m12, m13, m14, m21, m22, m23, m24, m31, m32, m33, m34, - ref m41, ref m42, ref m43, m44 } => write!( + ref m41, ref m42, ref m43, m44, + } => { + write!( dest, "matrix3d({}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {})", Css(m11), Css(m12), Css(m13), Css(m14), Css(m21), Css(m22), Css(m23), Css(m24), Css(m31), Css(m32), Css(m33), Css(m34), - Css(m41), Css(m42), Css(m43), Css(m44)), - SpecifiedOperation::Skew(ax, None) => write!(dest, "skew({})", Css(ax)), - SpecifiedOperation::Skew(ax, Some(ay)) => write!(dest, "skew({}, {})", Css(ax), Css(ay)), - SpecifiedOperation::SkewX(angle) => write!(dest, "skewX({})", Css(angle)), - SpecifiedOperation::SkewY(angle) => write!(dest, "skewY({})", Css(angle)), - SpecifiedOperation::Translate(ref tx, None) => write!(dest, "translate({})", Css(tx)), + Css(m41), Css(m42), Css(m43), Css(m44), + ) + } + SpecifiedOperation::Skew(ax, None) => { + write!(dest, "skew({})", Css(ax)) + } + SpecifiedOperation::Skew(ax, Some(ay)) => { + write!(dest, "skew({}, {})", Css(ax), Css(ay)) + } + SpecifiedOperation::SkewX(angle) => { + write!(dest, "skewX({})", Css(angle)) + } + SpecifiedOperation::SkewY(angle) => { + write!(dest, "skewY({})", Css(angle)) + } + SpecifiedOperation::Translate(ref tx, None) => { + write!(dest, "translate({})", Css(tx)) + } SpecifiedOperation::Translate(ref tx, Some(ref ty)) => { write!(dest, "translate({}, {})", Css(tx), Css(ty)) - }, - SpecifiedOperation::TranslateX(ref tx) => write!(dest, "translateX({})", Css(tx)), - SpecifiedOperation::TranslateY(ref ty) => write!(dest, "translateY({})", Css(ty)), - SpecifiedOperation::TranslateZ(ref tz) => write!(dest, "translateZ({})", Css(tz)), - SpecifiedOperation::Translate3D(ref tx, ref ty, ref tz) => write!( - dest, "translate3d({}, {}, {})", Css(tx), Css(ty), Css(tz)), - SpecifiedOperation::Scale(factor, None) => write!(dest, "scale({})", Css(factor)), - SpecifiedOperation::Scale(sx, Some(sy)) => write!(dest, "scale({}, {})", Css(sx), Css(sy)), - SpecifiedOperation::ScaleX(sx) => write!(dest, "scaleX({})", Css(sx)), - SpecifiedOperation::ScaleY(sy) => write!(dest, "scaleY({})", Css(sy)), - SpecifiedOperation::ScaleZ(sz) => write!(dest, "scaleZ({})", Css(sz)), + } + SpecifiedOperation::TranslateX(ref tx) => { + write!(dest, "translateX({})", Css(tx)) + } + SpecifiedOperation::TranslateY(ref ty) => { + write!(dest, "translateY({})", Css(ty)) + } + SpecifiedOperation::TranslateZ(ref tz) => { + write!(dest, "translateZ({})", Css(tz)) + } + SpecifiedOperation::Translate3D(ref tx, ref ty, ref tz) => { + write!(dest, "translate3d({}, {}, {})", Css(tx), Css(ty), Css(tz)) + } + SpecifiedOperation::Scale(factor, None) => { + write!(dest, "scale({})", Css(factor)) + } + SpecifiedOperation::Scale(sx, Some(sy)) => { + write!(dest, "scale({}, {})", Css(sx), Css(sy)) + } + SpecifiedOperation::ScaleX(sx) => { + write!(dest, "scaleX({})", Css(sx)) + } + SpecifiedOperation::ScaleY(sy) => { + write!(dest, "scaleY({})", Css(sy)) + } + SpecifiedOperation::ScaleZ(sz) => { + write!(dest, "scaleZ({})", Css(sz)) + } SpecifiedOperation::Scale3D(sx, sy, sz) => { write!(dest, "scale3d({}, {}, {})", Css(sx), Css(sy), Css(sz)) - }, - SpecifiedOperation::Rotate(theta) => write!(dest, "rotate({})", Css(theta)), - SpecifiedOperation::RotateX(theta) => write!(dest, "rotateX({})", Css(theta)), - SpecifiedOperation::RotateY(theta) => write!(dest, "rotateY({})", Css(theta)), - SpecifiedOperation::RotateZ(theta) => write!(dest, "rotateZ({})", Css(theta)), - SpecifiedOperation::Rotate3D(x, y, z, theta) => write!( - dest, "rotate3d({}, {}, {}, {})", - Css(x), Css(y), Css(z), Css(theta)), - SpecifiedOperation::Perspective(ref length) => write!(dest, "perspective({})", Css(length)), + } + SpecifiedOperation::Rotate(theta) => { + write!(dest, "rotate({})", Css(theta)) + } + SpecifiedOperation::RotateX(theta) => { + write!(dest, "rotateX({})", Css(theta)) + } + SpecifiedOperation::RotateY(theta) => { + write!(dest, "rotateY({})", Css(theta)) + } + SpecifiedOperation::RotateZ(theta) => { + write!(dest, "rotateZ({})", Css(theta)) + } + SpecifiedOperation::Rotate3D(x, y, z, theta) => { + write!(dest, "rotate3d({}, {}, {}, {})", Css(x), Css(y), Css(z), Css(theta)) + } + SpecifiedOperation::Perspective(ref length) => { + write!(dest, "perspective({})", Css(length)) + } SpecifiedOperation::InterpolateMatrix { ref from_list, ref to_list, progress } => { write!(dest, "interpolatematrix({}, {}, {})", Css(from_list), Css(to_list), Css(progress)) - }, + } SpecifiedOperation::AccumulateMatrix { ref from_list, ref to_list, count } => { write!(dest, "accumulatematrix({}, {}, {})", Css(from_list), Css(to_list), Css(count))