From fcc555a04225e79646b7c3df65ecb51d813d12ec Mon Sep 17 00:00:00 2001 From: Vincent Ollivier Date: Mon, 14 Oct 2024 21:07:45 +0200 Subject: [PATCH] Rename Color#to_vga_reg to Color#register --- src/sys/vga/color.rs | 2 +- src/sys/vga/palette.rs | 2 +- src/sys/vga/writer.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sys/vga/color.rs b/src/sys/vga/color.rs index f63661fb..f4b43a51 100644 --- a/src/sys/vga/color.rs +++ b/src/sys/vga/color.rs @@ -66,7 +66,7 @@ impl Color { } } - pub fn to_vga_reg(&self) -> u8 { + pub fn register(&self) -> usize { match self { Color::DarkBlack => 0x00, Color::DarkBlue => 0x01, diff --git a/src/sys/vga/palette.rs b/src/sys/vga/palette.rs index aaa77dcb..42f3f216 100644 --- a/src/sys/vga/palette.rs +++ b/src/sys/vga/palette.rs @@ -27,7 +27,7 @@ impl Palette { pub fn default() -> Palette { let mut colors = [(0, 0, 0); 256]; for (i, (r, g, b)) in DEFAULT_COLORS.iter().enumerate() { - let i = Color::from_index(i).to_vga_reg() as usize; + let i = Color::from_index(i).register(); colors[i] = (*r, *g, *b); } Palette { colors } diff --git a/src/sys/vga/writer.rs b/src/sys/vga/writer.rs index c669db6a..a1cbc5d2 100644 --- a/src/sys/vga/writer.rs +++ b/src/sys/vga/writer.rs @@ -472,7 +472,7 @@ impl Perform for Writer { match s.chars().next() { Some('P') if s.len() == 8 => { if let Ok((i, r, g, b)) = parse_palette(&s) { - let i = Color::from_index(i).to_vga_reg() as usize; + let i = Color::from_index(i).register(); self.set_palette(i, r, g, b); } }