Skip to content

Commit f9d3e65

Browse files
BeinseziiBeinsezii
committed
RUSTFMT set line wrap 120
1 parent 7833742 commit f9d3e65

File tree

2 files changed

+26
-110
lines changed

2 files changed

+26
-110
lines changed

‎rustfmt.toml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
max_width = 120

‎src/lib.rs

+25-110
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,7 @@ pub fn unweave<const N: usize>(slice: &[f32]) -> [Box<[f32]>; N] {
2525
.unwrap();
2626

2727
slice.chunks_exact(N).for_each(|chunk| {
28-
chunk
29-
.iter()
30-
.zip(result.iter_mut())
31-
.for_each(|(v, arr)| arr.push(*v));
28+
chunk.iter().zip(result.iter_mut()).for_each(|(v, arr)| arr.push(*v));
3229
});
3330

3431
result.map(|v| v.into_boxed_slice())
@@ -703,12 +700,7 @@ pub fn convert_space_sliced(from: Space, to: Space, pixels: &mut [f32]) {
703700
///
704701
/// Returns 0 on success, 1 on invalid `from`, 2 on invalid `to`, 3 on invalid `pixels`
705702
#[no_mangle]
706-
pub extern "C" fn convert_space_ffi(
707-
from: *const c_char,
708-
to: *const c_char,
709-
pixels: *mut f32,
710-
len: usize,
711-
) -> i32 {
703+
pub extern "C" fn convert_space_ffi(from: *const c_char, to: *const c_char, pixels: *mut f32, len: usize) -> i32 {
712704
let from = unsafe {
713705
if from.is_null() {
714706
return 1;
@@ -754,13 +746,7 @@ pub extern "C" fn convert_space_ffi(
754746

755747
/// Same as `convert_space`, ignores the 4th value in `pixel`.
756748
pub fn convert_space_alpha(from: Space, to: Space, pixel: &mut [f32; 4]) {
757-
unsafe {
758-
convert_space(
759-
from,
760-
to,
761-
pixel.get_unchecked_mut(0..3).try_into().unwrap_unchecked(),
762-
)
763-
}
749+
unsafe { convert_space(from, to, pixel.get_unchecked_mut(0..3).try_into().unwrap_unchecked()) }
764750
}
765751

766752
// ### Convert Space ### }}}
@@ -805,14 +791,10 @@ pub fn str2col(mut s: &str) -> Option<(Space, [f32; 3])> {
805791
let seps = [',', ':', ';'];
806792

807793
// Find Space at front then trim
808-
if let Some(i) =
809-
s.find(|c: char| c.is_whitespace() || seps.contains(&c) || ['(', '[', '{'].contains(&c))
810-
{
794+
if let Some(i) = s.find(|c: char| c.is_whitespace() || seps.contains(&c) || ['(', '[', '{'].contains(&c)) {
811795
if let Ok(sp) = Space::try_from(&s[..i]) {
812796
space = sp;
813-
s = rm_paren(
814-
s[i..].trim_start_matches(|c: char| c.is_whitespace() || seps.contains(&c)),
815-
);
797+
s = rm_paren(s[i..].trim_start_matches(|c: char| c.is_whitespace() || seps.contains(&c)));
816798
}
817799
}
818800

@@ -1400,11 +1382,7 @@ mod tests {
14001382
pix_cmp(&input, reference, epsilon, skips);
14011383
}
14021384

1403-
fn func_cmp(
1404-
input: &[[f32; 3]],
1405-
reference: &[[f32; 3]],
1406-
function: extern "C" fn(&mut [f32; 3]),
1407-
) {
1385+
fn func_cmp(input: &[[f32; 3]], reference: &[[f32; 3]], function: extern "C" fn(&mut [f32; 3])) {
14081386
func_cmp_full(input, reference, function, 1e-3, &[])
14091387
}
14101388

@@ -1421,20 +1399,8 @@ mod tests {
14211399
pix_cmp(&input, reference, epsilon, skips)
14221400
}
14231401

1424-
fn conv_cmp(
1425-
input_space: Space,
1426-
input: &[[f32; 3]],
1427-
reference_space: Space,
1428-
reference: &[[f32; 3]],
1429-
) {
1430-
conv_cmp_full(
1431-
input_space,
1432-
input,
1433-
reference_space,
1434-
reference,
1435-
1e-2,
1436-
&[0, 7],
1437-
)
1402+
fn conv_cmp(input_space: Space, input: &[[f32; 3]], reference_space: Space, reference: &[[f32; 3]]) {
1403+
conv_cmp_full(input_space, input, reference_space, reference, 1e-2, &[0, 7])
14381404
}
14391405
// ### Comparison FNs ### }}}
14401406

@@ -1447,8 +1413,7 @@ mod tests {
14471413
#[test]
14481414
fn irgb_from() {
14491415
let mut srgb = irgb_to_srgb(IRGB);
1450-
srgb.iter_mut()
1451-
.for_each(|c| *c = (*c * 100.0).round() / 100.0);
1416+
srgb.iter_mut().for_each(|c| *c = (*c * 100.0).round() / 100.0);
14521417
assert_eq!([0.2, 0.35, 0.95], srgb)
14531418
}
14541419

@@ -1638,11 +1603,7 @@ mod tests {
16381603
assert_eq!(deinterleaved[0].len(), deinterleaved[1].len());
16391604
assert_eq!(deinterleaved[0].len(), deinterleaved[2].len());
16401605
let chunked: Vec<[f32; 3]> = (0..deinterleaved[0].len()).fold(Vec::new(), |mut acc, it| {
1641-
acc.push([
1642-
deinterleaved[0][it],
1643-
deinterleaved[1][it],
1644-
deinterleaved[2][it],
1645-
]);
1606+
acc.push([deinterleaved[0][it], deinterleaved[1][it], deinterleaved[2][it]]);
16461607
acc
16471608
});
16481609

@@ -1719,10 +1680,7 @@ mod tests {
17191680
// ### Str2Col ### {{{
17201681
#[test]
17211682
fn str2col_base() {
1722-
assert_eq!(
1723-
str2col("0.2, 0.5, 0.6"),
1724-
Some((Space::SRGB, [0.2, 0.5, 0.6]))
1725-
)
1683+
assert_eq!(str2col("0.2, 0.5, 0.6"), Some((Space::SRGB, [0.2, 0.5, 0.6])))
17261684
}
17271685

17281686
#[test]
@@ -1732,10 +1690,7 @@ mod tests {
17321690

17331691
#[test]
17341692
fn str2col_base_lop() {
1735-
assert_eq!(
1736-
str2col("0.2,0.5, 0.6"),
1737-
Some((Space::SRGB, [0.2, 0.5, 0.6]))
1738-
)
1693+
assert_eq!(str2col("0.2,0.5, 0.6"), Some((Space::SRGB, [0.2, 0.5, 0.6])))
17391694
}
17401695

17411696
#[test]
@@ -1745,26 +1700,17 @@ mod tests {
17451700

17461701
#[test]
17471702
fn str2col_base_bare_fat() {
1748-
assert_eq!(
1749-
str2col(" 0.2 0.5 0.6 "),
1750-
Some((Space::SRGB, [0.2, 0.5, 0.6]))
1751-
)
1703+
assert_eq!(str2col(" 0.2 0.5 0.6 "), Some((Space::SRGB, [0.2, 0.5, 0.6])))
17521704
}
17531705

17541706
#[test]
17551707
fn str2col_base_paren() {
1756-
assert_eq!(
1757-
str2col("(0.2 0.5 0.6)"),
1758-
Some((Space::SRGB, [0.2, 0.5, 0.6]))
1759-
)
1708+
assert_eq!(str2col("(0.2 0.5 0.6)"), Some((Space::SRGB, [0.2, 0.5, 0.6])))
17601709
}
17611710

17621711
#[test]
17631712
fn str2col_base_paren2() {
1764-
assert_eq!(
1765-
str2col("{ 0.2 : 0.5 : 0.6 }"),
1766-
Some((Space::SRGB, [0.2, 0.5, 0.6]))
1767-
)
1713+
assert_eq!(str2col("{ 0.2 : 0.5 : 0.6 }"), Some((Space::SRGB, [0.2, 0.5, 0.6])))
17681714
}
17691715

17701716
#[test]
@@ -1789,50 +1735,32 @@ mod tests {
17891735

17901736
#[test]
17911737
fn str2col_lch() {
1792-
assert_eq!(
1793-
str2col("lch(50, 30, 160)"),
1794-
Some((Space::CIELCH, [50.0, 30.0, 160.0]))
1795-
)
1738+
assert_eq!(str2col("lch(50, 30, 160)"), Some((Space::CIELCH, [50.0, 30.0, 160.0])))
17961739
}
17971740

17981741
#[test]
17991742
fn str2col_lch_space() {
1800-
assert_eq!(
1801-
str2col("lch 50, 30, 160"),
1802-
Some((Space::CIELCH, [50.0, 30.0, 160.0]))
1803-
)
1743+
assert_eq!(str2col("lch 50, 30, 160"), Some((Space::CIELCH, [50.0, 30.0, 160.0])))
18041744
}
18051745

18061746
#[test]
18071747
fn str2col_lch_colon() {
1808-
assert_eq!(
1809-
str2col("lch:50:30:160"),
1810-
Some((Space::CIELCH, [50.0, 30.0, 160.0]))
1811-
)
1748+
assert_eq!(str2col("lch:50:30:160"), Some((Space::CIELCH, [50.0, 30.0, 160.0])))
18121749
}
18131750

18141751
#[test]
18151752
fn str2col_lch_semicolon() {
1816-
assert_eq!(
1817-
str2col("lch;50;30;160"),
1818-
Some((Space::CIELCH, [50.0, 30.0, 160.0]))
1819-
)
1753+
assert_eq!(str2col("lch;50;30;160"), Some((Space::CIELCH, [50.0, 30.0, 160.0])))
18201754
}
18211755

18221756
#[test]
18231757
fn str2col_lch_mixed() {
1824-
assert_eq!(
1825-
str2col("lch; (50,30,160)"),
1826-
Some((Space::CIELCH, [50.0, 30.0, 160.0]))
1827-
)
1758+
assert_eq!(str2col("lch; (50,30,160)"), Some((Space::CIELCH, [50.0, 30.0, 160.0])))
18281759
}
18291760

18301761
#[test]
18311762
fn str2col_lch_mixed2() {
1832-
assert_eq!(
1833-
str2col("lch(50; 30; 160)"),
1834-
Some((Space::CIELCH, [50.0, 30.0, 160.0]))
1835-
)
1763+
assert_eq!(str2col("lch(50; 30; 160)"), Some((Space::CIELCH, [50.0, 30.0, 160.0])))
18361764
}
18371765

18381766
#[test]
@@ -1854,11 +1782,7 @@ mod tests {
18541782
str2col("oklch 100% 100% 100%"),
18551783
Some((
18561784
Space::OKLCH,
1857-
[
1858-
Space::OKLCH.srgb_quant100()[0],
1859-
Space::OKLCH.srgb_quant100()[1],
1860-
360.0,
1861-
]
1785+
[Space::OKLCH.srgb_quant100()[0], Space::OKLCH.srgb_quant100()[1], 360.0]
18621786
))
18631787
)
18641788
}
@@ -1884,11 +1808,7 @@ mod tests {
18841808
str2col("oklch 0% 0% 0%"),
18851809
Some((
18861810
Space::OKLCH,
1887-
[
1888-
Space::OKLCH.srgb_quant0()[0],
1889-
Space::OKLCH.srgb_quant0()[1],
1890-
0.0,
1891-
]
1811+
[Space::OKLCH.srgb_quant0()[0], Space::OKLCH.srgb_quant0()[1], 0.0]
18921812
))
18931813
)
18941814
}
@@ -1899,11 +1819,7 @@ mod tests {
18991819
str2col("oklab 0.5 100.000% 0%"),
19001820
Some((
19011821
Space::OKLAB,
1902-
[
1903-
0.5,
1904-
Space::OKLAB.srgb_quant100()[1],
1905-
Space::OKLAB.srgb_quant0()[2],
1906-
]
1822+
[0.5, Space::OKLAB.srgb_quant100()[1], Space::OKLAB.srgb_quant0()[2]]
19071823
))
19081824
)
19091825
}
@@ -1925,8 +1841,7 @@ mod tests {
19251841

19261842
#[test]
19271843
fn str2space_base() {
1928-
let pix = str2space("oklch : 0.62792590, 0.25768453, 29.22319405", Space::SRGB)
1929-
.expect("STR2SPACE_BASE FAIL");
1844+
let pix = str2space("oklch : 0.62792590, 0.25768453, 29.22319405", Space::SRGB).expect("STR2SPACE_BASE FAIL");
19301845
let reference = [1.00000000, 0.00000000, 0.00000000];
19311846
pix_cmp(&[pix], &[reference], 1e-3, &[]);
19321847
}

0 commit comments

Comments
 (0)