CSSIntegerWithInfinity to CSSInteger

Author: yisibl

src/properties/align.rs

@@ -11,6 +11,7 @@ use crate::prefixes::{is_flex_2009, Feature};
 use crate::printer::Printer;
 use crate::traits::{FromStandard, Parse, PropertyHandler, Shorthand, ToCss};
 use crate::values::length::LengthPercentage;
+use crate::values::number::CSSInteger;
 use crate::vendor_prefix::VendorPrefix;
 #[cfg(feature = "visitor")]
 use crate::visitor::Visit;

src/properties/flex.rs

@@ -11,7 +11,7 @@ use crate::macros::*;
 use crate::prefixes::{is_flex_2009, Feature};
 use crate::printer::Printer;
 use crate::traits::{FromStandard, Parse, PropertyHandler, Shorthand, ToCss, Zero};
-use crate::values::number::{CSSIntegerWithInfinity, CSSNumber};
+use crate::values::number::{CSSInteger, CSSNumber};
 use crate::values::{
   length::{LengthPercentage, LengthPercentageOrAuto},
   percentage::Percentage,
@@ -350,15 +350,15 @@ impl FromStandard<FlexWrap> for BoxLines {
   }
 }
 
-type BoxOrdinalGroup = CSSIntegerWithInfinity;
-impl FromStandard<CSSIntegerWithInfinity> for BoxOrdinalGroup {
-  fn from_standard(order: &CSSIntegerWithInfinity) -> Option<BoxOrdinalGroup> {
+type BoxOrdinalGroup = CSSInteger;
+impl FromStandard<CSSInteger> for BoxOrdinalGroup {
+  fn from_standard(order: &CSSInteger) -> Option<BoxOrdinalGroup> {
     Some(*order)
   }
 }
 
 /// A value for the legacy (prefixed) [box-flex-group](https://www.w3.org/TR/2009/WD-css3-flexbox-20090723/#box-flex-group) property.
-pub type BoxFlexGroup = CSSIntegerWithInfinity;
+pub type BoxFlexGroup = CSSInteger;
 
 // Old flex (2012): https://www.w3.org/TR/2012/WD-css3-flexbox-20120322/
 
@@ -487,9 +487,9 @@ pub(crate) struct FlexHandler {
   flex_negative: Option<(CSSNumber, VendorPrefix)>,
   basis: Option<(LengthPercentageOrAuto, VendorPrefix)>,
   preferred_size: Option<(LengthPercentageOrAuto, VendorPrefix)>,
-  order: Option<(CSSIntegerWithInfinity, VendorPrefix)>,
+  order: Option<(CSSInteger, VendorPrefix)>,
   box_ordinal_group: Option<(BoxOrdinalGroup, VendorPrefix)>,
-  flex_order: Option<(CSSIntegerWithInfinity, VendorPrefix)>,
+  flex_order: Option<(CSSInteger, VendorPrefix)>,
   has_any: bool,
 }
 

src/properties/mod.rs

@@ -129,7 +129,7 @@ use crate::prefixes::Feature;
 use crate::printer::{Printer, PrinterOptions};
 use crate::targets::Targets;
 use crate::traits::{Parse, ParseWithOptions, Shorthand, ToCss};
-use crate::values::number::{CSSIntegerWithInfinity, CSSNumber};
+use crate::values::number::{CSSInteger, CSSNumber};
 use crate::values::string::CowArcStr;
 use crate::values::{
   alpha::*, color::*, easing::EasingFunction, ident::DashedIdentReference, ident::NoneOrCustomIdentList, image::*,
@@ -1335,7 +1335,7 @@ define_properties! {
   "flex-shrink": FlexShrink(CSSNumber, VendorPrefix) / WebKit,
   "flex-basis": FlexBasis(LengthPercentageOrAuto, VendorPrefix) / WebKit,
   "flex": Flex(Flex, VendorPrefix) / WebKit / Ms shorthand: true,
-  "order": Order(CSSIntegerWithInfinity, VendorPrefix) / WebKit,
+  "order": Order(CSSInteger, VendorPrefix) / WebKit,
 
   // Align properties: https://www.w3.org/TR/2020/WD-css-align-3-20200421
   "align-content": AlignContent(AlignContent, VendorPrefix) / WebKit,
@@ -1354,16 +1354,16 @@ define_properties! {
   // Old flex (2009): https://www.w3.org/TR/2009/WD-css3-flexbox-20090723/
   "box-orient": BoxOrient(BoxOrient, VendorPrefix) / WebKit / Moz unprefixed: false,
   "box-direction": BoxDirection(BoxDirection, VendorPrefix) / WebKit / Moz unprefixed: false,
-  "box-ordinal-group": BoxOrdinalGroup(CSSIntegerWithInfinity, VendorPrefix) / WebKit / Moz unprefixed: false,
+  "box-ordinal-group": BoxOrdinalGroup(CSSInteger, VendorPrefix) / WebKit / Moz unprefixed: false,
   "box-align": BoxAlign(BoxAlign, VendorPrefix) / WebKit / Moz unprefixed: false,
   "box-flex": BoxFlex(CSSNumber, VendorPrefix) / WebKit / Moz unprefixed: false,
-  "box-flex-group": BoxFlexGroup(CSSIntegerWithInfinity, VendorPrefix) / WebKit unprefixed: false,
+  "box-flex-group": BoxFlexGroup(CSSInteger, VendorPrefix) / WebKit unprefixed: false,
   "box-pack": BoxPack(BoxPack, VendorPrefix) / WebKit / Moz unprefixed: false,
   "box-lines": BoxLines(BoxLines, VendorPrefix) / WebKit / Moz unprefixed: false,
 
   // Old flex (2012): https://www.w3.org/TR/2012/WD-css3-flexbox-20120322/
   "flex-pack": FlexPack(FlexPack, VendorPrefix) / Ms unprefixed: false,
-  "flex-order": FlexOrder(CSSIntegerWithInfinity, VendorPrefix) / Ms unprefixed: false,
+  "flex-order": FlexOrder(CSSInteger, VendorPrefix) / Ms unprefixed: false,
   "flex-align": FlexAlign(BoxAlign, VendorPrefix) / Ms unprefixed: false,
   "flex-item-align": FlexItemAlign(FlexItemAlign, VendorPrefix) / Ms unprefixed: false,
   "flex-line-pack": FlexLinePack(FlexLinePack, VendorPrefix) / Ms unprefixed: false,

src/properties/position.rs

@@ -7,7 +7,7 @@ use crate::error::{ParserError, PrinterError};
 use crate::prefixes::Feature;
 use crate::printer::Printer;
 use crate::traits::{Parse, PropertyHandler, ToCss};
-use crate::values::number::CSSIntegerWithInfinity;
+use crate::values::number::CSSInteger;
 use crate::vendor_prefix::VendorPrefix;
 #[cfg(feature = "visitor")]
 use crate::visitor::Visit;
@@ -86,7 +86,7 @@ pub enum ZIndex {
   /// The `auto` keyword.
   Auto,
   /// An integer value (supports infinity via calc()).
-  Integer(CSSIntegerWithInfinity),
+  Integer(CSSInteger),
 }
 
 impl<'i> Parse<'i> for ZIndex {
@@ -95,8 +95,8 @@ impl<'i> Parse<'i> for ZIndex {
       return Ok(ZIndex::Auto);
     }
 
-    // Use CSSIntegerWithInfinity::parse which handles calc() and infinity
-    let integer = CSSIntegerWithInfinity::parse(input)?;
+    // Use CSSInteger::parse which handles calc() and infinity
+    let integer = CSSInteger::parse(input)?;
     Ok(ZIndex::Integer(integer))
   }
 }

src/values/easing.rs

@@ -7,7 +7,6 @@ use crate::values::number::{CSSInteger, CSSNumber};
 #[cfg(feature = "visitor")]
 use crate::visitor::Visit;
 use cssparser::*;
-use std::fmt::Write;
 
 /// A CSS [easing function](https://www.w3.org/TR/css-easing-1/#easing-functions).
 #[derive(Debug, Clone, PartialEq)]
@@ -172,7 +171,7 @@ impl ToCss for EasingFunction {
       } => dest.write_str("step-end"),
       EasingFunction::Steps { count, position } => {
         dest.write_str("steps(")?;
-        write!(dest, "{}", count)?;
+        count.to_css(dest)?;
         dest.delim(',', false)?;
         position.to_css(dest)?;
         dest.write_char(')')