collapse single match blocks (clippy::single_match, clippy::single_match_else)

This commit is contained in:
Daniel Eades 2024-04-14 20:58:19 +01:00 • committed by Jeremy Soller
parent dcae0a4c2e
commit 011af310d2
2 changed files with 57 additions and 64 deletions

View file

@ -110,25 +110,25 @@ fn convert_color(colors: &Colors, color: Color) -> cosmic_text::Color {
let rgb = match color {
Color::Named(named_color) => match colors[named_color] {
Some(rgb) => rgb,
None => match named_color {
NamedColor::Background => {
None => {
if named_color == NamedColor::Background {
// Allow using an unset background
return cosmic_text::Color(WINDOW_BG_COLOR.load(Ordering::SeqCst));
}
_ => {
} else {
log::warn!("missing named color {:?}", named_color);
Rgb::default()
}
},
}
},
Color::Spec(rgb) => rgb,
Color::Indexed(index) => match colors[index as usize] {
Some(rgb) => rgb,
None => {
Color::Indexed(index) => {
if let Some(rgb) = colors[index as usize] {
rgb
} else {
log::warn!("missing indexed color {}", index);
Rgb::default()
}
},
}
};
cosmic_text::Color::rgb(rgb.r, rgb.g, rgb.b)
}