diff options
| author | Nick Price <nick@spun.io> | 2016-12-09 17:57:20 -0500 |
|---|---|---|
| committer | Nick Price <nick@spun.io> | 2016-12-09 17:57:20 -0500 |
| commit | 731706041d770c36c295c942f9c75e88aa599a07 (patch) | |
| tree | 5d1c5c89c2857a6c5efa13ab7305153306675880 | |
| parent | e5f995e7c42528f1bdd13ab37a8691d91bbd36ba (diff) | |
| download | servo-731706041d770c36c295c942f9c75e88aa599a07.tar.gz servo-731706041d770c36c295c942f9c75e88aa599a07.zip | |
Add LengthOrNormal type aliases
| -rw-r--r-- | components/style/values/computed/length.rs | 4 | ||||
| -rw-r--r-- | components/style/values/specified/length.rs | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/components/style/values/computed/length.rs b/components/style/values/computed/length.rs index 3ba131409f8..a7ec7f5ba22 100644 --- a/components/style/values/computed/length.rs +++ b/components/style/values/computed/length.rs @@ -7,7 +7,7 @@ use ordered_float::NotNaN; use std::fmt; use style_traits::ToCss; use super::{Number, ToComputedValue, Context}; -use values::{Auto, CSSFloat, Either, None_, specified}; +use values::{Auto, CSSFloat, Either, None_, Normal, specified}; pub use cssparser::Color as CSSColor; pub use super::image::{EndingShape as GradientShape, Gradient, GradientKind, Image}; @@ -475,4 +475,6 @@ pub type LengthOrAuto = Either<Length, Auto>; pub type LengthOrNumber = Either<Length, Number>; +pub type LengthOrNormal = Either<Length, Normal>; + pub type Length = Au; diff --git a/components/style/values/specified/length.rs b/components/style/values/specified/length.rs index f8f237ab401..40fb57a4963 100644 --- a/components/style/values/specified/length.rs +++ b/components/style/values/specified/length.rs @@ -14,7 +14,7 @@ use std::ops::Mul; use style_traits::ToCss; use style_traits::values::specified::AllowedNumericType; use super::{Angle, Number, SimplifiedValueNode, SimplifiedSumNode, Time}; -use values::{Auto, CSSFloat, Either, FONT_MEDIUM_PX, HasViewportPercentage, None_}; +use values::{Auto, CSSFloat, Either, FONT_MEDIUM_PX, HasViewportPercentage, None_, Normal}; use values::computed::Context; pub use super::image::{AngleOrCorner, ColorStop, EndingShape as GradientEndingShape, Gradient}; @@ -952,6 +952,8 @@ impl Parse for LengthOrPercentageOrNone { pub type LengthOrNone = Either<Length, None_>; +pub type LengthOrNormal = Either<Length, Normal>; + pub type LengthOrAuto = Either<Length, Auto>; #[derive(Clone, PartialEq, Copy, Debug)] |