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

avoid unwrapping in special functions rgb/rgba one arg green

Browse Source
This commit is contained in:
ConnorSkees 2020-04-06 22:26:43 -04:00
parent 65ba25e555
commit c95c69be4d
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/builtin/color/rgb.rs
View File

@ -53,9 +53,12 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
(n / Number::from(100)) * Number::from(255) (n / Number::from(100)) * Number::from(255)
} }
Some(v) if v.is_special_function() => { Some(v) if v.is_special_function() => {
let red = channels.pop().unwrap(); let string = match channels.pop() {
Some(red) => format!("rgb({}, {}, {})", red, v, blue),
None => format!("rgb({}, {})", v, blue),
};
return Ok(Value::Ident( return Ok(Value::Ident(
format!("rgb({}, {}, {})", red, v, blue), string,
QuoteKind::None, QuoteKind::None,
)); ));
} }
@ -238,9 +241,12 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
(n / Number::from(100)) * Number::from(255) (n / Number::from(100)) * Number::from(255)
} }
Some(v) if v.is_special_function() => { Some(v) if v.is_special_function() => {
let red = channels.pop().unwrap(); let string = match channels.pop() {
Some(red) => format!("rgba({}, {}, {})", red, v, blue),
None => format!("rgba({}, {})", v, blue),
};
return Ok(Value::Ident( return Ok(Value::Ident(
format!("rgba({}, {}, {})", red, v, blue), string,
QuoteKind::None, QuoteKind::None,
)); ));
} }