Skip to content

Commit 8f4d82b

Browse files
committed
Add testcase
1 parent 076fae9 commit 8f4d82b

1 file changed

Lines changed: 7 additions & 12 deletions

File tree

libs/sheet/src/theme.rs

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -366,10 +366,9 @@ impl<'de> Deserialize<'de> for TokenValues {
366366
.collect::<Result<Vec<_>, _>>()?;
367367
Ok(Self(result))
368368
}
369-
_ => {
370-
let msg = format!("Expected string, number, or array, got: {value:?}");
371-
Err(serde::de::Error::custom(msg))
372-
}
369+
other => Err(serde::de::Error::custom(format!(
370+
"Expected string, number, or array, got: {other:?}"
371+
))),
373372
}
374373
}
375374
}
@@ -699,14 +698,10 @@ impl Theme {
699698

700699
// Sort variants: default first, then alphabetical
701700
let mut sorted_variants: Vec<_> = themes.iter().collect();
702-
sorted_variants.sort_by(|a, b| {
703-
if a.0 == &default_key {
704-
Ordering::Less
705-
} else if b.0 == &default_key {
706-
Ordering::Greater
707-
} else {
708-
a.0.cmp(b.0)
709-
}
701+
sorted_variants.sort_by(|a, b| match (a.0 == &default_key, b.0 == &default_key) {
702+
(true, false) => Ordering::Less,
703+
(false, true) => Ordering::Greater,
704+
_ => a.0.cmp(b.0),
710705
});
711706

712707
for (variant_name, token_theme) in &sorted_variants {

0 commit comments

Comments
 (0)