aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHimbeerserverDE <himbeerserverde@gmail.com>2022-09-20 17:18:06 +0200
committerHimbeerserverDE <himbeerserverde@gmail.com>2022-09-20 17:18:06 +0200
commit34e6bf29d4d83cef3a44e80052167e13807974bb (patch)
tree95cac84cabf3807fbc070712d79d429fb8a2d79d
parent0cf3aa0880e8f58eef7c237b39146137c50204ae (diff)
Less operators
-rw-r--r--stage2/src/vga.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/stage2/src/vga.rs b/stage2/src/vga.rs
index fa4a499..efa492e 100644
--- a/stage2/src/vga.rs
+++ b/stage2/src/vga.rs
@@ -1,4 +1,4 @@
-use core::ops::{AddAssign, Deref, DerefMut, Shl, Sub};
+use core::ops::{AddAssign, BitOr, Deref, DerefMut, Shl, Sub};
use lazy_static::lazy_static;
use spin::Mutex;
@@ -32,7 +32,7 @@ pub struct ColorCode(u8);
impl ColorCode {
pub fn new(foreground: Color, background: Color) -> ColorCode {
- ColorCode((background as u8).shl(4) | (foreground as u8))
+ ColorCode(((background as u8).shl(4) as u8).bitor(foreground as u8))
}
}