Skip to content

Commit 75e5bc5

Browse files
epagerami3l
authored andcommitted
refactor(update): Centralize style knowledge
1 parent 02c7834 commit 75e5bc5

File tree

1 file changed

+7
-12
lines changed

1 file changed

+7
-12
lines changed

src/cli/common.rs

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -146,11 +146,11 @@ fn show_channel_updates(
146146
updates: Vec<(PackageUpdate, Result<UpdateStatus>)>,
147147
) -> Result<()> {
148148
let data = updates.into_iter().map(|(pkg, result)| {
149-
let (banner, color) = match &result {
150-
Ok(UpdateStatus::Installed) => ("installed", Some(AnsiColor::Green)),
151-
Ok(UpdateStatus::Updated(_)) => ("updated", Some(AnsiColor::Green)),
152-
Ok(UpdateStatus::Unchanged) => ("unchanged", None),
153-
Err(_) => ("update failed", Some(AnsiColor::Red)),
149+
let (banner, style) = match &result {
150+
Ok(UpdateStatus::Installed) => ("installed", AnsiColor::Green.on_default().bold()),
151+
Ok(UpdateStatus::Updated(_)) => ("updated", AnsiColor::Green.on_default().bold()),
152+
Ok(UpdateStatus::Unchanged) => ("unchanged", Style::new().bold()),
153+
Err(_) => ("update failed", AnsiColor::Red.on_default().bold()),
154154
};
155155

156156
let (previous_version, version) = match &pkg {
@@ -185,7 +185,7 @@ fn show_channel_updates(
185185

186186
let width = pkg.to_string().len() + 1 + banner.len();
187187

188-
Ok((pkg, banner, width, color, version, previous_version))
188+
Ok((pkg, banner, width, style, version, previous_version))
189189
});
190190

191191
let t = cfg.process.stdout();
@@ -196,14 +196,9 @@ fn show_channel_updates(
196196
.iter()
197197
.fold(0, |a, &(_, _, width, _, _, _)| cmp::max(a, width));
198198

199-
for (pkg, banner, width, color, version, previous_version) in data {
199+
for (pkg, banner, width, style, version, previous_version) in data {
200200
let padding = max_width - width;
201201
let padding: String = " ".repeat(padding);
202-
let style = match color {
203-
Some(color) => color.on_default(),
204-
None => Style::new(),
205-
}
206-
.bold();
207202
let _ = write!(t, " {padding}{style}{pkg} {banner}{style:#} - {version}");
208203
if let Some(previous_version) = previous_version {
209204
let _ = write!(t, " (from {previous_version})");

0 commit comments

Comments
 (0)