wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-12-04 17:45:23 +03:00
Code Issues Projects Releases Wiki Activity

rustfmt

Browse Source
This commit is contained in:
Wez Furlong 2022-07-17 21:55:39 -07:00
parent 1c32ac95bf
commit c81dabd76b
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
color-types/src/lib.rs
View File

@ -1,7 +1,7 @@
use csscolorparser::Color;
#[cfg(feature = "use_serde")] #[cfg(feature = "use_serde")]
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::HashMap; use std::collections::HashMap;
use csscolorparser::Color;
use std::hash::{Hash, Hasher}; use std::hash::{Hash, Hasher};
use std::str::FromStr; use std::str::FromStr;
@ -239,7 +239,12 @@ impl From<SrgbaTuple> for (f32, f32, f32, f32) {
impl From<Color> for SrgbaTuple { impl From<Color> for SrgbaTuple {
fn from(color: Color) -> Self { fn from(color: Color) -> Self {
Self(color.r as f32, color.g as f32, color.b as f32, color.a as f32) Self(
color.r as f32,
color.g as f32,
color.b as f32,
color.a as f32,
)
} }
} }
@ -359,17 +364,15 @@ impl SrgbaTuple {
} }
pub fn to_laba(self) -> (f64, f64, f64, f64) { pub fn to_laba(self) -> (f64, f64, f64, f64) {
Color::new(self.0.into(), self.1.into(), self.2.into(), self.3.into()) Color::new(self.0.into(), self.1.into(), self.2.into(), self.3.into()).to_lab()
.to_lab()
} }
pub fn to_hsla(self) -> (f64, f64, f64, f64) { pub fn to_hsla(self) -> (f64, f64, f64, f64) {
Color::new(self.0.into(), self.1.into(), self.2.into(), self.3.into()) Color::new(self.0.into(), self.1.into(), self.2.into(), self.3.into()).to_hsla()
.to_hsla()
} }
pub fn from_hsla(h: f64, s: f64, l: f64, a: f64) -> Self { pub fn from_hsla(h: f64, s: f64, l: f64, a: f64) -> Self {
let Color{r, g, b, a} = Color::from_hsla(h, s, l, a); let Color { r, g, b, a } = Color::from_hsla(h, s, l, a);
Self(r as f32, g as f32, b as f32, a as f32) Self(r as f32, g as f32, b as f32, a as f32)
} }

7
lua-api-crates/color-funcs/src/image_colors.rs
View File

@ -288,7 +288,12 @@ pub fn extract_colors_from_image<'lua>(
color.b.into(), color.b.into(),
1.0, 1.0,
); );
let tuple = SrgbaTuple(color.r as f32, color.g as f32, color.b as f32, color.a as f32); let tuple = SrgbaTuple(
color.r as f32,
color.g as f32,
color.b as f32,
color.a as f32,
);
ColorWrap(tuple.into()) ColorWrap(tuple.into())
}) })
.collect(); .collect();