From 689b732184c227b4f49e2b509fad06c1f31c4e4b Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Tue, 16 Nov 2021 19:12:36 +0100 Subject: switch RawPalette to integer representation Introducing a simple type for RGB colors. That awkward string representation for RawPalette got unwieldy quick. --- src/vtcol.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/vtcol.rs') diff --git a/src/vtcol.rs b/src/vtcol.rs index d3399fc..b0c4b85 100644 --- a/src/vtcol.rs +++ b/src/vtcol.rs @@ -187,11 +187,11 @@ impl<'a> Job ) }), Scheme::Custom(None) => - Palette::from_stdin().dump(&mut out).map_err(|e| { + Palette::from_stdin()?.dump(&mut out).map_err(|e| { anyhow!("error loading palette from stdin: {}", e) }), Scheme::Custom(Some(fname)) => - Palette::from_file(&fname).dump(&mut out).map_err(|e| { + Palette::from_file(&fname)?.dump(&mut out).map_err(|e| { anyhow!( "error loading palette from file [{}]: {}", fname.display(), @@ -251,7 +251,7 @@ impl<'a> Job let fd = Console::current()?; vrb!("console fd: {}", fd); - if fd.current_palette()? == Palette::from(&one) { + if fd.current_palette()? == Palette::try_from(&one)? { Self::set_scheme(two) } else { Self::set_scheme(one) -- cgit v1.2.3