shadowfacts/grass
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Properly handle unknown units

Browse Source
This commit is contained in:
ConnorSkees 2020-01-22 00:54:43 -05:00
parent 8acb535347
commit 54aca3b84e
1 changed files with 44 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
src/units.rs
View File

@ -1,7 +1,6 @@
use std::convert::TryFrom;
use std::fmt; use std::fmt;
#[derive(Copy, Clone, Debug, Eq, PartialEq)] #[derive(Clone, Debug, Eq, PartialEq)]
pub(crate) enum Unit { pub(crate) enum Unit {
// Absolute units // Absolute units
/// Pixels /// Pixels
@ -85,51 +84,52 @@ pub(crate) enum Unit {
/// Represents a fraction of the available space in the grid container /// Represents a fraction of the available space in the grid container
Fr, Fr,
/// Unknown unit
Unknown(String),
/// Unspecified unit /// Unspecified unit
None, None,
} }
impl TryFrom<&str> for Unit { impl From<&String> for Unit {
type Error = &'static str; fn from(unit: &String) -> Self {
fn try_from(unit: &str) -> Result<Self, Self::Error> {
match unit.to_ascii_lowercase().as_bytes() { match unit.to_ascii_lowercase().as_bytes() {
b"px" => Ok(Unit::Px), b"px" => Unit::Px,
b"mm" => Ok(Unit::Mm), b"mm" => Unit::Mm,
b"in" => Ok(Unit::In), b"in" => Unit::In,
b"cm" => Ok(Unit::Cm), b"cm" => Unit::Cm,
b"Q" => Ok(Unit::Q), b"Q" => Unit::Q,
b"pt" => Ok(Unit::Pt), b"pt" => Unit::Pt,
b"pc" => Ok(Unit::Pc), b"pc" => Unit::Pc,
b"em" => Ok(Unit::Em), b"em" => Unit::Em,
b"rem" => Ok(Unit::Rem), b"rem" => Unit::Rem,
b"lh" => Ok(Unit::Lh), b"lh" => Unit::Lh,
b"%" => Ok(Unit::Percent), b"%" => Unit::Percent,
b"ex" => Ok(Unit::Ex), b"ex" => Unit::Ex,
b"ch" => Ok(Unit::Ch), b"ch" => Unit::Ch,
b"cap" => Ok(Unit::Cap), b"cap" => Unit::Cap,
b"ic" => Ok(Unit::Ic), b"ic" => Unit::Ic,
b"rlh" => Ok(Unit::Rlh), b"rlh" => Unit::Rlh,
b"vw" => Ok(Unit::Vw), b"vw" => Unit::Vw,
b"vh" => Ok(Unit::Vh), b"vh" => Unit::Vh,
b"vmin" => Ok(Unit::Vmin), b"vmin" => Unit::Vmin,
b"vmax" => Ok(Unit::Vmax), b"vmax" => Unit::Vmax,
b"vi" => Ok(Unit::Vi), b"vi" => Unit::Vi,
b"vb" => Ok(Unit::Vb), b"vb" => Unit::Vb,
b"deg" => Ok(Unit::Deg), b"deg" => Unit::Deg,
b"grad" => Ok(Unit::Grad), b"grad" => Unit::Grad,
b"rad" => Ok(Unit::Rad), b"rad" => Unit::Rad,
b"turn" => Ok(Unit::Turn), b"turn" => Unit::Turn,
b"s" => Ok(Unit::S), b"s" => Unit::S,
b"ms" => Ok(Unit::Ms), b"ms" => Unit::Ms,
b"Hz" => Ok(Unit::Hz), b"Hz" => Unit::Hz,
b"kHz" => Ok(Unit::Khz), b"kHz" => Unit::Khz,
b"dpi" => Ok(Unit::Dpi), b"dpi" => Unit::Dpi,
b"dpcm" => Ok(Unit::Dpcm), b"dpcm" => Unit::Dpcm,
b"dppx" => Ok(Unit::Dppx), b"dppx" => Unit::Dppx,
b"x" => Ok(Unit::X), b"x" => Unit::X,
b"fr" => Ok(Unit::Fr), b"fr" => Unit::Fr,
_ => Err("invalid unit"), _ => Unit::Unknown(String::from(unit)),
} }
} }
} }
@ -173,54 +173,12 @@ impl Into<String> for Unit {
Unit::X => "x", Unit::X => "x",
Unit::Fr => "fr", Unit::Fr => "fr",
Unit::None => "", Unit::None => "",
Unit::Unknown(ref s) => s,
} }
.into() .into()
} }
} }
impl Into<&'static str> for Unit {
fn into(self) -> &'static str {
match self {
Unit::Px => "px",
Unit::Mm => "mm",
Unit::In => "in",
Unit::Cm => "cm",
Unit::Q => "Q",
Unit::Pt => "pt",
Unit::Pc => "pc",
Unit::Em => "em",
Unit::Rem => "rem",
Unit::Lh => "lh",
Unit::Percent => "%",
Unit::Ex => "ex",
Unit::Ch => "ch",
Unit::Cap => "cap",
Unit::Ic => "ic",
Unit::Rlh => "rlh",
Unit::Vw => "vw",
Unit::Vh => "vh",
Unit::Vmin => "vmin",
Unit::Vmax => "vmax",
Unit::Vi => "vi",
Unit::Vb => "vb",
Unit::Deg => "deg",
Unit::Grad => "grad",
Unit::Rad => "rad",
Unit::Turn => "turn",
Unit::S => "s",
Unit::Ms => "ms",
Unit::Hz => "Hz",
Unit::Khz => "kHz",
Unit::Dpi => "dpi",
Unit::Dpcm => "dpcm",
Unit::Dppx => "dppx",
Unit::X => "x",
Unit::Fr => "fr",
Unit::None => "",
}
}
}
impl fmt::Display for Unit { impl fmt::Display for Unit {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match self { match self {
@ -259,6 +217,7 @@ impl fmt::Display for Unit {
Unit::Dppx => write!(f, "dppx"), Unit::Dppx => write!(f, "dppx"),
Unit::X => write!(f, "x"), Unit::X => write!(f, "x"),
Unit::Fr => write!(f, "fr"), Unit::Fr => write!(f, "fr"),
Unit::Unknown(s) => write!(f, "{}", s),
Unit::None => write!(f, ""), Unit::None => write!(f, ""),
} }
} }